From 38ad55851a20e5725589f49c746f5487138cbf9b Mon Sep 17 00:00:00 2001 From: Robert Lord Date: Fri, 27 Sep 2013 13:37:36 -0700 Subject: [PATCH] Change language declaration Now, if no languages are specified, the language selection bar simply doesn't appear. It has also been renamed from "languages" to "language_tabs". Additionally, now language names default to the markdown name. They can still be overridden by the languagename:Display Name syntax. --- source/javascripts/lang_selector.js | 1 - source/layouts/layout.erb | 21 ++++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/source/javascripts/lang_selector.js b/source/javascripts/lang_selector.js index 09f4621..1a67123 100644 --- a/source/javascripts/lang_selector.js +++ b/source/javascripts/lang_selector.js @@ -24,4 +24,3 @@ function setupLanguages(l) { }); } - diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb index b8f5803..b2c4265 100644 --- a/source/layouts/layout.erb +++ b/source/layouts/layout.erb @@ -32,8 +32,14 @@ } }); setupLanguages([ - <% current_page.data.languages.each do |lang| %> - ['<%= lang[0] %>'], + <% if current_page.data.language_tabs %> + <% current_page.data.language_tabs.each do |lang| %> + <% if lang.is_a? Hash %> + ['<%= lang.keys[0] %>'], + <% else %> + ['<%= lang %>'], + <% end %> + <% end %> <% end %> ]); }); @@ -47,13 +53,18 @@
- <%= yield %>
- <% current_page.data.languages.each do |lang| %> - <%= lang[1] %> + <% if current_page.data.language_tabs %> + <% current_page.data.language_tabs.each do |lang| %> + <% if lang.is_a? Hash %> + <%= lang.values[0] %> + <% else %> + <%= lang %> + <% end %> + <% end %> <% end %>