Changeset 4201
- Timestamp:
- 07/16/07 14:07:15 (1 year ago)
- Files:
-
- rubricks_core/trunk/components/system/languages/english.rb (modified) (4 diffs)
- rubricks_core/trunk/components/system/languages/japanese.rb (modified) (4 diffs)
- rubricks_core/trunk/components/system/search/main.rhtml (modified) (3 diffs)
- rubricks_core/trunk/components/system/user/user_select.rhtml (modified) (1 diff)
- rubricks_core/trunk/components/system/user_management/_group_show_group_permission_edit_window.rhtml (modified) (1 diff)
- rubricks_core/trunk/components/system/user_management/_main_user_filter.rhtml (modified) (2 diffs)
- rubricks_core/trunk/languages/english.rb (modified) (2 diffs)
- rubricks_core/trunk/languages/japanese.rb (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
rubricks_core/trunk/components/system/languages/english.rb
r4200 r4201 215 215 '_System_AdminUser_ErrorUnauthorized' => 'You cannot revoke your own authority of user management.', 216 216 '_System_AdminUser_GroupCreate' => 'New Group', 217 '_System_AdminUser_GroupPermissionGrant' => 'Grant',218 '_System_AdminUser_GroupPermissionInherit' => 'Inherit',219 '_System_AdminUser_GroupPermissionRevoke' => 'Revoke',220 217 '_System_AdminUser_GroupUserEdit' => 'Edit Users', 221 218 '_System_AdminUser_MessageGroupCreate' => 'Create the new group.', … … 239 236 '_System_AdminUser_UserCreate' => 'New User', 240 237 '_System_AdminUser_UserFilterDefaultQuery' => 'User Name', 241 '_System_AdminUser_UserFilterMatchBackward' => 'Backward',242 '_System_AdminUser_UserFilterMatchForward' => 'Forward',243 '_System_AdminUser_UserFilterMatchFull' => 'Full',244 238 '_System_AdminUser_UserFilterTypeAll' => 'All', 245 239 '_System_AdminUser_UserFilterTypeInvalid' => 'Invalid', … … 275 269 '_System_Menu_TemplateUser' => 'User Page Template', 276 270 '_System_Menu_Top' => 'Top Page', 277 '_System_Search_Condition' => 'Search Condition',278 271 '_System_Search_DescriptionAnd1' => 'Intersection Search (Default)', 279 272 '_System_Search_DescriptionAnd2' => 'plz add space between the search keywords.', … … 290 283 '_System_Search_MessageNoResult' => 'Not match any contents. please try again to change search conditions.', 291 284 '_System_Search_MessageNoTarget' => 'There is no compornent for search', 292 '_System_Search_Result' => 'Search Result',293 '_System_Search_Target' => 'Search Target : ',294 285 '_System_Search_Title' => 'Search', 295 286 '_System_ThemeChanger_Confirm' => 'Are you sure to change theme? You may lost editings if exists.', rubricks_core/trunk/components/system/languages/japanese.rb
r4200 r4201 251 251 '_System_AdminUser_ErrorUnauthorized' => 'èªåã®ããŠãŒã¶ç®¡çãæš©éãå¥å¥ªããããšã¯ã§ããŸããã', 252 252 '_System_AdminUser_GroupCreate' => 'æ°èŠã°ã«ãŒã', 253 '_System_AdminUser_GroupPermissionGrant' => 'ä»äž',254 '_System_AdminUser_GroupPermissionInherit' => 'ç¶æ¿',255 '_System_AdminUser_GroupPermissionRevoke' => 'å¥å¥ª',256 253 '_System_AdminUser_GroupUserEdit' => 'æå±ãŠãŒã¶ç·šé', 257 254 '_System_AdminUser_MessageGroupCreate' => 'ã°ã«ãŒããäœæããŸããã', … … 278 275 '_System_AdminUser_UserCreate' => 'æ°èŠãŠãŒã¶', 279 276 '_System_AdminUser_UserFilterDefaultQuery' => 'ãŠãŒã¶åãããã¯ãã¿ããª', 280 '_System_AdminUser_UserFilterMatchBackward' => 'åŸæ¹äžèŽ',281 '_System_AdminUser_UserFilterMatchForward' => 'åæ¹äžèŽ',282 '_System_AdminUser_UserFilterMatchFull' => 'å®å283 šäžèŽ',284 277 '_System_AdminUser_UserFilterTypeAll' => 'å 285 278 šãŠãŒã¶', … … 319 312 ±é', 320 313 '_System_Menu_Top' => 'ãããããŒãž', 321 '_System_Search_Condition' => 'æ€çŽ¢æ¡ä»¶',322 314 '_System_Search_DescriptionAnd1' => 'ANDæ€çŽ¢(ããã©ã«ã)', 323 315 '_System_Search_DescriptionAnd2' => 'æ€çŽ¢ããŒã¯ãŒããã ã(åè§ã¹ããŒã¹)ã§åºåã£ãŠæå®ããŠäžããã', … … 338 330 '_System_Search_MessageNoResult' => '該åœããææžãèŠã€ãããŸããã§ãããæ€çŽ¢æ¡ä»¶ãå€æŽããŠå床æ€çŽ¢ããŠã¿ãŠäžããã', 339 331 '_System_Search_MessageNoTarget' => 'æ€çŽ¢å¯Ÿè±¡ã®ã³ã³ããŒãã³ãããããŸããã', 340 '_System_Search_Result' => 'æ€çŽ¢çµæ',341 '_System_Search_Target' => 'æ€çŽ¢å¯Ÿè±¡ïŒ',342 332 '_System_Search_Title' => 'æ€çŽ¢', 343 333 '_System_ThemeChanger_Confirm' => 'ããŒããå€æŽããŠããããã§ããïŒçŸåšç·šéäžã®äœæ¥ã¯å€±ãããå¯èœæ§ããããŸãã', rubricks_core/trunk/components/system/search/main.rhtml
r3835 r4201 4 4 <% render_content_body do %> 5 5 <% render_list_frame('01') do %> 6 <% render_list('01', '[_ System_Search_Condition]') do %>6 <% render_list('01', '[_Common_SearchConditions]') do %> 7 7 <form id="rubricks_search_form" onsubmit="rubricks.system.search.set_search_hash(); return false;"> 8 8 <div class="system_search_query"> … … 12 12 <table> 13 13 <tr> 14 <td><%= hl('[_ System_Search_Target]') %></td>14 <td><%= hl('[_Common_SearchTarget][_Common_Colon]') %></td> 15 15 <td> 16 16 <select id="tc" name="tc" onchange="rubricks.system.search.change_target_component(this.value);"> … … 36 36 <% end %> 37 37 <% render_detail_frame('01') do %> 38 <% render_detail('01', '[_ System_Search_Result]') do %>38 <% render_detail('01', '[_Common_SearchResult]') do %> 39 39 <div id="search_result"> 40 40 <% if @search_result %> rubricks_core/trunk/components/system/user/user_select.rhtml
r4158 r4201 134 134 <div class="system_user_select_filter_line"> 135 135 <select id="<%= hl(@options[:prefix]) %>filter_conditions_user_match" name="filter_conditions[user_match]" onchange="rubricks.common.fire_onsubmit('<%= hl(@options[:prefix]) %>filter_form');"> 136 <option value="forward"<%= (@user_filter[:user_match] == 'forward') ? ' selected="selected"' : '' %>><%= hl('[_ System_AdminUser_UserFilterMatchForward]') %></option>137 <option value="backward"<%= (@user_filter[:user_match] == 'backward') ? ' selected="selected"' : '' %>><%= hl('[_ System_AdminUser_UserFilterMatchBackward]') %></option>138 <option value="full"<%= (@user_filter[:user_match] == 'full') ? ' selected="selected"' : '' %>><%= hl('[_ System_AdminUser_UserFilterMatchFull]') %></option>136 <option value="forward"<%= (@user_filter[:user_match] == 'forward') ? ' selected="selected"' : '' %>><%= hl('[_Common_FilterMatchForward]') %></option> 137 <option value="backward"<%= (@user_filter[:user_match] == 'backward') ? ' selected="selected"' : '' %>><%= hl('[_Common_FilterMatchBackward]') %></option> 138 <option value="full"<%= (@user_filter[:user_match] == 'full') ? ' selected="selected"' : '' %>><%= hl('[_Common_FilterMatchFull]') %></option> 139 139 </select> 140 140 <input type="text" id="<%= hl(@options[:prefix]) %>filter_conditions_user_word" name="filter_conditions[user_word]" class="input_text_inactive focus" size="16" value="<%= (@user_filter[:user_word].blank?) ? '' : hl(@user_filter[:user_word]) %>" /> rubricks_core/trunk/components/system/user_management/_group_show_group_permission_edit_window.rhtml
r4180 r4201 4 4 <% render_float_button('admin_user_fba7') do %> 5 5 <div id="group_permission_inherit_form" class="float_button_right_inactive swap"> 6 <span id="group_permission_inherit_button" class="buttons icon_permission_inherit" onclick="rubricks.system.admin_user.functions.group_permission_inherit();"><%= hl('[_ System_AdminUser_GroupPermissionInherit]') %></span>6 <span id="group_permission_inherit_button" class="buttons icon_permission_inherit" onclick="rubricks.system.admin_user.functions.group_permission_inherit();"><%= hl('[_Common_Inherit]') %></span> 7 7 </div> 8 8 <div id="group_permission_revoke_form" class="float_button_right_inactive swap"> 9 <span id="group_permission_revoke_button" class="buttons icon_permission_revoke" onclick="rubricks.system.admin_user.functions.group_permission_revoke();"><%= hl('[_ System_AdminUser_GroupPermissionRevoke]') %></span>9 <span id="group_permission_revoke_button" class="buttons icon_permission_revoke" onclick="rubricks.system.admin_user.functions.group_permission_revoke();"><%= hl('[_Common_Revoke]') %></span> 10 10 </div> 11 11 <div id="group_permission_grant_form" class="float_button_right_inactive swap"> 12 <span id="group_permission_grant_button" class="buttons icon_permission_grant" onclick="rubricks.system.admin_user.functions.group_permission_grant();"><%= hl('[_ System_AdminUser_GroupPermissionGrant]') %></span>12 <span id="group_permission_grant_button" class="buttons icon_permission_grant" onclick="rubricks.system.admin_user.functions.group_permission_grant();"><%= hl('[_Common_Grant]') %></span> 13 13 </div> 14 14 <% end %> rubricks_core/trunk/components/system/user_management/_main_user_filter.rhtml
r4188 r4201 1 1 <div class="rubricks_general_filter_switch"> 2 2 <span id="user_filter_switch"></span> 3 <span><%= hl('[_Common_ SearchConditions]') %></span>3 <span><%= hl('[_Common_Filter]') %></span> 4 4 </div> 5 5 <div id="user_filter_area"> … … 25 25 <div class="rubricks_general_filter"> 26 26 <select id="filter_conditions_user_match" name="filter_conditions[user_match]" onchange="rubricks.common.fire_onsubmit('user_filter_form');" style="display:none;"> 27 <option value="forward"<%= (@user_filter[:user_match] == 'forward') ? ' selected="selected"' : '' %>><%= hl('[_ System_AdminUser_UserFilterMatchForward]') %></option>28 <option value="backward"<%= (@user_filter[:user_match] == 'backward') ? ' selected="selected"' : '' %>><%= hl('[_ System_AdminUser_UserFilterMatchBackward]') %></option>29 <option value="full"<%= (@user_filter[:user_match] == 'full') ? ' selected="selected"' : '' %>><%= hl('[_ System_AdminUser_UserFilterMatchFull]') %></option>27 <option value="forward"<%= (@user_filter[:user_match] == 'forward') ? ' selected="selected"' : '' %>><%= hl('[_Common_FilterMatchForward]') %></option> 28 <option value="backward"<%= (@user_filter[:user_match] == 'backward') ? ' selected="selected"' : '' %>><%= hl('[_Common_FilterMatchBackward]') %></option> 29 <option value="full"<%= (@user_filter[:user_match] == 'full') ? ' selected="selected"' : '' %>><%= hl('[_Common_FilterMatchFull]') %></option> 30 30 </select> 31 31 <input type="text" id="filter_conditions_user_word" name="filter_conditions[user_word]" class="input_text_inactive focus" size="24" value="<%= (@user_filter[:user_word].blank?) ? hl('[_System_AdminUser_UserFilterDefaultQuery]') : hl(@user_filter[:user_word]) %>" onfocus="rubricks.system.admin_user.functions.filter_focus();" onblur="rubricks.system.admin_user.functions.filter_blur();" /> rubricks_core/trunk/languages/english.rb
r4200 r4201 35 35 '_Common_Close' => 'Close', 36 36 '_Common_Closed' => 'Closed', 37 '_Common_Colon' => ' : ', 37 38 '_Common_Comment' => 'Comment', 38 39 '_Common_Completed' => 'Completed', … … 255 256 '_Common_Validate_CheckboxLessThan' => 'plz check more than %d.', 256 257 '_Common_Validate_Checking' => 'now checking', 257 '_Common_Validate_DateFormat' => @lang['_Common_DatePicker_Format_String'] + 'style is required.',258 '_Common_Validate_DateFormat' => 'yyyy/MM/dd style is required.', 258 259 '_Common_Validate_FileFormat' => 'Plz input %s file.', 259 260 '_Common_Validate_InvalidDate' => 'invalid date.', rubricks_core/trunk/languages/japanese.rb
r4200 r4201 40 40 '_Common_Closed' => 'éå 41 41 ¬é', 42 '_Common_Colon' => 'ïŒ', 42 43 '_Common_Comment' => 'ã³ã¡ã³ã', 43 44 '_Common_Completed' => 'å®äº', … … 286 287 '_Common_Validate_CheckboxLessThan' => '%då以äžãã§ãã¯ããŠäžããã', 287 288 '_Common_Validate_Checking' => 'ãã§ãã¯äžã§ãã', 288 '_Common_Validate_DateFormat' => @lang['_Common_DatePicker_Format_String'] + '圢åŒã§å289 '_Common_Validate_DateFormat' => 'yyyy/MM/dd圢åŒã§å 289 290 ¥åããŠäžããã', 290 291 '_Common_Validate_FileFormat' => '%s圢åŒã®ãã¡ã€ã«ãæå®ããŠäžããã',
