Changes for i18n yml

app/views/admin/users/_form.html.erb

@@ -7,15 +7,15 @@
  	<%= file_field_tag 'file' %>
  	<%= hidden_field_tag :avatar_cache %>
 	<label>
-	<span><%= t('admin.email') %>：</span>
-	<%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => (@user.email.blank? ? t('admin.email') : @user.email), :class => 'user_mail' %>
+	<span><%= t(:email) %>：</span>
+	<%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t(:email)};}", :value => (@user.email.blank? ? t(:email) : @user.email), :class => 'user_mail' %>
 	</label>
 	<label>
     <%= f.check_box :admin %>
-	<span><%= t('admin.admin') %>：</span>
+	<span><%= t(:admin) %>：</span>
 	</label>
 	<label>
-	<span><%= t('admin.role') %>：</span>
+	<span><%= t(:role) %>：</span>
 	<%= f.select :role_id, @roles.sort_by{|role| role.key }.collect {|role| [ role.title, role.id ]}, :selected => (@user.role_id || Role.get_role_from_key('student')) %>
 	</label>
 </div>

app/views/admin/users/_side_bar.html.erb

@@ -2,10 +2,10 @@
 	<input id="user_search" name="user[username]" size="30" type="text" />
 </div>
 <div class="member_setup <%= @class %>">
-	<h1><%= t('admin.setup_member') %></h1>
+	<h1><%= t(:setup_member) %></h1>
 	<ul class="list">
-		<li class="set_1"><%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %></li>
-		<li class="set_2"><%= link_to content_tag(:span, t('admin.list_roles')), admin_roles_path %></li>
-		<li class="set_3"><%= link_to content_tag(:span, t('admin.list_infos')), admin_infos_path %></li>
+		<li class="set_1"><%= link_to content_tag(:span, t('list.user')), admin_users_path %></li>
+		<li class="set_2"><%= link_to content_tag(:span, t('list.role')), admin_roles_path %></li>
+		<li class="set_3"><%= link_to content_tag(:span, t('list.info')), admin_infos_path %></li>
 	</ul>	
 </div>

app/views/admin/users/index.html.erb

@@ -5,16 +5,16 @@
 <div class="main_list clear">
 	<%= flash_messages %>
 	<div class="button_bar up">
-		<%= link_to t('admin.new_user'), new_admin_user_path, :class => 'new' %>
+		<%= link_to t('new.user'), new_admin_user_path, :class => 'new' %>
 	</div>
 	<table>
 		<thead>
 			<tr>
-				<td class="roles"><%= t('admin.role') %></td>
-				<td class="name"><%= t('admin.name') %></td>
-				<td class="email"><%= t('admin.email') %></td>
-				<td class="admin"><%= t('admin.admin') %></td>
-				<td class="action"><%= t('admin.action') %></td>
+				<td class="roles"><%= t(:role) %></td>
+				<td class="name"><%= t(:name) %></td>
+				<td class="email"><%= t(:email) %></td>
+				<td class="admin"><%= t(:admin) %></td>
+				<td class="action"><%= t(':action') %></td>
 			</tr>
 		</thead>
 		<tbody>
@@ -37,6 +37,6 @@
 		</tbody>
 	</table>
 	<div class="button_bar">
-		<%= link_to t('admin.new_user'), new_admin_user_path, :class => 'new' %>
+		<%= link_to t('new.user'), new_admin_user_path, :class => 'new' %>
 	</div>	
 </div>