From 2c06c03f4daecaa367126e1f2220e236e23ad182 Mon Sep 17 00:00:00 2001 From: manson Date: Wed, 10 Sep 2014 19:26:03 +0800 Subject: [PATCH] change member form first/last name position for zh_tw --- .../admin/members/_member_basic.html.erb | 42 +++++-------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/app/views/admin/members/_member_basic.html.erb b/app/views/admin/members/_member_basic.html.erb index df9d7fd..e50d4dc 100644 --- a/app/views/admin/members/_member_basic.html.erb +++ b/app/views/admin/members/_member_basic.html.erb @@ -35,50 +35,29 @@ - -
- -
-
-
-
- <% @site_in_use_locales.each_with_index do |locale, i| %> -
" id="first_name_<%= locale %>"> - <%= f.fields_for :first_name_translations do |f| %> - <%= f.text_field locale, :value => (@member.first_name_translations[locale] rescue nil), :placeholder=>"#{t("users.first_name")}" %> - <% end %> -
- <% end %> -
-
- <% @site_in_use_locales.each_with_index do |locale, i| %> - " href="#first_name_<%= locale %>" data-toggle="tab"><%= t(locale.to_s) %> - <% end %> - -
-
-
-
-
+ <% + name_fields = ['first_name', 'last_name'] + name_fields = ['last_name', 'first_name'] if I18n.locale.eql? :zh_tw + %> - + <% name_fields.each do |name_field| %>
- +
<% @site_in_use_locales.each_with_index do |locale, i| %> -
" id="last_name_<%= locale %>"> - <%= f.fields_for :last_name_translations do |f| %> - <%= f.text_field locale, :value => (@member.last_name_translations[locale] rescue nil), :placeholder=>"#{t("users.last_name")}" %> +
" id="<%= name_field %>_<%= locale %>"> + <%= f.fields_for "#{name_field}_translations".to_sym do |f| %> + <%= f.text_field locale, :value => (@member.send("#{name_field}_translations")[locale] rescue nil), :placeholder=>"#{t("users.#{name_field}")}" %> <% end %>
<% end %>
@@ -86,6 +65,7 @@
+ <% end %>