diff --git a/app/helpers/attribute_fields_helper.rb b/app/helpers/attribute_fields_helper.rb index 2705dc8f..be1b39ee 100644 --- a/app/helpers/attribute_fields_helper.rb +++ b/app/helpers/attribute_fields_helper.rb @@ -149,7 +149,7 @@ protected link_entry_ary = [".#{get_pairing_tab_class({})}",".#{key}"] link_entry_ary << ".add_more_item_#{add_more_counter}" if can_add_more link_entry = link_entry_ary.join - content_tag(:li,link_to(I18n.t("langs."+key),link_entry,:data=>{:toggle=>"tab"}),:class=>(key == I18n.locale.to_s ? "active" : nil),:for=>key) + content_tag(:li,link_to(I18nVariable.from_locale(key),link_entry,:data=>{:toggle=>"tab"}),:class=>(key == I18n.locale.to_s ? "active" : nil),:for=>key) end.join.html_safe # of VALID_LOCALES.collect for tabs end # of content ul end diff --git a/app/views/shared/attribute_field/_address_modal_dialog.html.erb b/app/views/shared/attribute_field/_address_modal_dialog.html.erb index 74944a00..45a91c7e 100644 --- a/app/views/shared/attribute_field/_address_modal_dialog.html.erb +++ b/app/views/shared/attribute_field/_address_modal_dialog.html.erb @@ -9,7 +9,7 @@ <% VALID_LOCALES.each do |locale|%> <% active = (locale == I18n.locale.to_s ? ["active"] : [] ) %> <%= content_tag :li,:class=>active.push("modal_tab","address_tab").join(' '),:for=>locale do%> - <%= link_to t("langs.#{locale}"),".#{btn_class}.address_modal.#{locale}",:data=>{:toggle=>"tab"}%> + <%= link_to I18nVariable.from_locale(locale),".#{btn_class}.address_modal.#{locale}",:data=>{:toggle=>"tab"}%> <% end %> <% end %> diff --git a/app/views/shared/attribute_field/_list_block.html.erb b/app/views/shared/attribute_field/_list_block.html.erb index 18407ab9..1843a1fc 100644 --- a/app/views/shared/attribute_field/_list_block.html.erb +++ b/app/views/shared/attribute_field/_list_block.html.erb @@ -10,7 +10,7 @@ <% last = (locale == @site_valid_locales.last ? true : false) %> <% p_value = value[locale.to_s] rescue nil%> <%= content_tag :div,:class=>"input-append #{"unRadius" if last }" do%> - <%= text_field("#{field_name}[0]", locale,:placeholder=>t("langs.#{locale}")) %> + <%= text_field("#{field_name}[0]", locale,:placeholder=>I18nVariable.from_locale(locale)) %> <% if last %> <% end %> @@ -26,7 +26,7 @@ <% last = (locale == @site_valid_locales.last ? true : false) %> <% p_value = value[locale.to_s] rescue nil%> <%= content_tag :div,:class=>"input-append #{"unRadius" if last }" do%> - <%= text_field("#{field_name}[#{index}]", locale,:value=>p_value,:placeholder=>t("langs.#{locale}")) %> + <%= text_field("#{field_name}[#{index}]", locale,:value=>p_value,:placeholder=>I18nVariable.from_locale(locale)) %> <% if last %> <% end %> diff --git a/app/views/shared/attribute_field/_placeholder_block.html.erb b/app/views/shared/attribute_field/_placeholder_block.html.erb index 5654b4da..6318d7c1 100644 --- a/app/views/shared/attribute_field/_placeholder_block.html.erb +++ b/app/views/shared/attribute_field/_placeholder_block.html.erb @@ -8,7 +8,7 @@ <% active = (locale == @site_valid_locales.first ? "active in" : "'") %> <%= content_tag :div,:class=>"tab-pane fade #{active}",:id=>"#{name_to_id(field_name)}_#{locale}" do%> <% locale_value = values[locale.to_s] rescue nil%> - <%= text_field(field_name, locale,:value=>locale_value,:placeholder=>t("langs.#{locale}")) %> + <%= text_field(field_name, locale,:value=>locale_value,:placeholder=>I18nVariable.from_locale(locale)) %> <% end %> <% end %> @@ -16,7 +16,7 @@ <% @site_valid_locales.each do |locale| %> <% active = (locale == @site_valid_locales.first ? "active" : "'") %> <%=content_tag :li,:class=>active do %> - <%= link_to t("langs.#{locale}"),"##{name_to_id(field_name)}_#{locale}",:data=>{:toggle=>"tab"}%> + <%= link_to I18nVariable.from_locale(locale),"##{name_to_id(field_name)}_#{locale}",:data=>{:toggle=>"tab"}%> <% end %> <% end %>