From bbe4e62148a4481798330b0a46e7ab17694d5f58 Mon Sep 17 00:00:00 2001 From: Yannick Francois Date: Tue, 15 Oct 2013 14:00:20 +0200 Subject: [PATCH] Move lang to locale for pages form --- app/views/admin/pages/_form.html.erb | 28 ++++++++++++++-------------- config/locales/da.yml | 11 +++++++++++ config/locales/de.yml | 11 +++++++++++ config/locales/en.yml | 11 +++++++++++ config/locales/es-MX.yml | 11 +++++++++++ config/locales/fr.yml | 11 +++++++++++ config/locales/he-IL.yml | 11 +++++++++++ config/locales/it.yml | 11 +++++++++++ config/locales/ja.yml | 13 ++++++++++++- config/locales/lt.yml | 11 +++++++++++ config/locales/nb-NO.yml | 11 +++++++++++ config/locales/nl.yml | 11 +++++++++++ config/locales/pl.yml | 11 +++++++++++ config/locales/pt-BR.yml | 11 +++++++++++ config/locales/ro.yml | 11 +++++++++++ config/locales/ru.yml | 11 +++++++++++ config/locales/zh-CN.yml | 11 +++++++++++ config/locales/zh-TW.yml | 11 +++++++++++ lang/da_DK.rb | 1 - lang/fr_FR.rb | 6 ------ lang/he_IL.rb | 4 ---- lang/it_IT.rb | 7 ------- lang/ja_JP.rb | 4 ---- lang/lt_LT.rb | 1 - lang/nb_NO.rb | 2 -- lang/nl_NL.rb | 2 -- lang/pl_PL.rb | 1 - lang/pt_BR.rb | 1 - lang/ro_RO.rb | 1 - lang/zh_CN.rb | 5 ----- lang/zh_TW.rb | 3 --- 31 files changed, 202 insertions(+), 53 deletions(-) diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb index c63daeba39..ff6e02d5d3 100644 --- a/app/views/admin/pages/_form.html.erb +++ b/app/views/admin/pages/_form.html.erb @@ -2,23 +2,23 @@ - + <%= error_messages_for 'page' %>
- <%= text_field 'page', 'title', :class => 'input-block-level', :placeholder => _('Title') %> + <%= text_field 'page', 'title', :class => 'input-block-level', :placeholder => t('.title') %>
- + <%= render('images', { :images => @images}) unless @images.empty? %> - +
- <%= toggle_element 'carousel-wrapper', _("Images") %> + <%= toggle_element 'carousel-wrapper', t(".images") %>
@@ -30,19 +30,19 @@
- <%= _("Publish settings") %> + <%= t(".publish_settings") %>
- <%= _("Status") %>: <%= _(@page.state.to_s.downcase) %> <%= toggle_element 'status' %> + <%= t(".status") %>: <%= _(@page.state.to_s.downcase) %> <%= toggle_element 'status' %>
- <%= _("Article filter") %>: <%= _("#{@page.text_filter.description}") %> <%= toggle_element 'text_filter' %> + <%= t(".article_filter") %>: <%= _("#{@page.text_filter.description}") %> <%= toggle_element 'text_filter' %>