##// END OF EJS Templates
Removed hardcoded string (#3872)....
Jean-Philippe Lang -
r11853:fbffe332e2a3
parent child
Show More
@@ -95,7 +95,7 class MyController < ApplicationController
95 if !@user.check_password?(params[:password])
95 if !@user.check_password?(params[:password])
96 flash.now[:error] = l(:notice_account_wrong_password)
96 flash.now[:error] = l(:notice_account_wrong_password)
97 elsif params[:password] == params[:new_password]
97 elsif params[:password] == params[:new_password]
98 flash.now[:error] = 'Your new password must be different from your current password'
98 flash.now[:error] = l(:notice_new_password_must_be_different)
99 else
99 else
100 @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
100 @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
101 @user.must_change_passwd = false
101 @user.must_change_passwd = false
@@ -1097,3 +1097,5 ar:
1097 label_visibility_roles: to these roles only
1097 label_visibility_roles: to these roles only
1098 label_visibility_public: to any users
1098 label_visibility_public: to any users
1099 field_must_change_passwd: Must change password at next logon
1099 field_must_change_passwd: Must change password at next logon
1100 notice_new_password_must_be_different: The new password must be different from the
1101 current password
@@ -1194,3 +1194,5 az:
1194 label_visibility_roles: to these roles only
1194 label_visibility_roles: to these roles only
1195 label_visibility_public: to any users
1195 label_visibility_public: to any users
1196 field_must_change_passwd: Must change password at next logon
1196 field_must_change_passwd: Must change password at next logon
1197 notice_new_password_must_be_different: The new password must be different from the
1198 current password
@@ -1095,3 +1095,5 bg:
1095 description_date_to: Въведете крайна дата
1095 description_date_to: Въведете крайна дата
1096 text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
1096 text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
1097 field_must_change_passwd: Must change password at next logon
1097 field_must_change_passwd: Must change password at next logon
1098 notice_new_password_must_be_different: The new password must be different from the
1099 current password
@@ -1110,3 +1110,5 bs:
1110 label_visibility_roles: to these roles only
1110 label_visibility_roles: to these roles only
1111 label_visibility_public: to any users
1111 label_visibility_public: to any users
1112 field_must_change_passwd: Must change password at next logon
1112 field_must_change_passwd: Must change password at next logon
1113 notice_new_password_must_be_different: The new password must be different from the
1114 current password
@@ -1099,3 +1099,5 ca:
1099 label_visibility_roles: to these roles only
1099 label_visibility_roles: to these roles only
1100 label_visibility_public: to any users
1100 label_visibility_public: to any users
1101 field_must_change_passwd: Must change password at next logon
1101 field_must_change_passwd: Must change password at next logon
1102 notice_new_password_must_be_different: The new password must be different from the
1103 current password
@@ -1101,3 +1101,5 cs:
1101 label_visibility_roles: to these roles only
1101 label_visibility_roles: to these roles only
1102 label_visibility_public: to any users
1102 label_visibility_public: to any users
1103 field_must_change_passwd: Must change password at next logon
1103 field_must_change_passwd: Must change password at next logon
1104 notice_new_password_must_be_different: The new password must be different from the
1105 current password
@@ -1114,3 +1114,5 da:
1114 label_visibility_roles: to these roles only
1114 label_visibility_roles: to these roles only
1115 label_visibility_public: to any users
1115 label_visibility_public: to any users
1116 field_must_change_passwd: Must change password at next logon
1116 field_must_change_passwd: Must change password at next logon
1117 notice_new_password_must_be_different: The new password must be different from the
1118 current password
@@ -1109,3 +1109,5 de:
1109 label_visibility_roles: to these roles only
1109 label_visibility_roles: to these roles only
1110 label_visibility_public: to any users
1110 label_visibility_public: to any users
1111 field_must_change_passwd: Must change password at next logon
1111 field_must_change_passwd: Must change password at next logon
1112 notice_new_password_must_be_different: The new password must be different from the
1113 current password
@@ -1097,3 +1097,5 el:
1097 label_visibility_roles: to these roles only
1097 label_visibility_roles: to these roles only
1098 label_visibility_public: to any users
1098 label_visibility_public: to any users
1099 field_must_change_passwd: Must change password at next logon
1099 field_must_change_passwd: Must change password at next logon
1100 notice_new_password_must_be_different: The new password must be different from the
1101 current password
@@ -1099,3 +1099,5 en-GB:
1099 label_visibility_roles: to these roles only
1099 label_visibility_roles: to these roles only
1100 label_visibility_public: to any users
1100 label_visibility_public: to any users
1101 field_must_change_passwd: Must change password at next logon
1101 field_must_change_passwd: Must change password at next logon
1102 notice_new_password_must_be_different: The new password must be different from the
1103 current password
@@ -181,6 +181,7 en:
181 notice_issue_update_conflict: "The issue has been updated by an other user while you were editing it."
181 notice_issue_update_conflict: "The issue has been updated by an other user while you were editing it."
182 notice_account_deleted: "Your account has been permanently deleted."
182 notice_account_deleted: "Your account has been permanently deleted."
183 notice_user_successful_create: "User %{id} created."
183 notice_user_successful_create: "User %{id} created."
184 notice_new_password_must_be_different: The new password must be different from the current password
184
185
185 error_can_t_load_default_data: "Default configuration could not be loaded: %{value}"
186 error_can_t_load_default_data: "Default configuration could not be loaded: %{value}"
186 error_scm_not_found: "The entry or revision was not found in the repository."
187 error_scm_not_found: "The entry or revision was not found in the repository."
@@ -1133,3 +1133,5 es:
1133 label_visibility_roles: solamente para estos roles
1133 label_visibility_roles: solamente para estos roles
1134 label_visibility_public: para cualquier usuario
1134 label_visibility_public: para cualquier usuario
1135 field_must_change_passwd: Must change password at next logon
1135 field_must_change_passwd: Must change password at next logon
1136 notice_new_password_must_be_different: The new password must be different from the
1137 current password
@@ -1110,3 +1110,5 et:
1110 label_visibility_roles: to these roles only
1110 label_visibility_roles: to these roles only
1111 label_visibility_public: to any users
1111 label_visibility_public: to any users
1112 field_must_change_passwd: Must change password at next logon
1112 field_must_change_passwd: Must change password at next logon
1113 notice_new_password_must_be_different: The new password must be different from the
1114 current password
@@ -1098,3 +1098,5 eu:
1098 label_visibility_roles: to these roles only
1098 label_visibility_roles: to these roles only
1099 label_visibility_public: to any users
1099 label_visibility_public: to any users
1100 field_must_change_passwd: Must change password at next logon
1100 field_must_change_passwd: Must change password at next logon
1101 notice_new_password_must_be_different: The new password must be different from the
1102 current password
@@ -1099,3 +1099,5 fa:
1099 label_visibility_roles: to these roles only
1099 label_visibility_roles: to these roles only
1100 label_visibility_public: to any users
1100 label_visibility_public: to any users
1101 field_must_change_passwd: Must change password at next logon
1101 field_must_change_passwd: Must change password at next logon
1102 notice_new_password_must_be_different: The new password must be different from the
1103 current password
@@ -1118,3 +1118,5 fi:
1118 label_visibility_roles: to these roles only
1118 label_visibility_roles: to these roles only
1119 label_visibility_public: to any users
1119 label_visibility_public: to any users
1120 field_must_change_passwd: Must change password at next logon
1120 field_must_change_passwd: Must change password at next logon
1121 notice_new_password_must_be_different: The new password must be different from the
1122 current password
@@ -196,6 +196,7 fr:
196 notice_issue_update_conflict: "La demande a été mise à jour par un autre utilisateur pendant que vous la modifiez."
196 notice_issue_update_conflict: "La demande a été mise à jour par un autre utilisateur pendant que vous la modifiez."
197 notice_account_deleted: "Votre compte a été définitivement supprimé."
197 notice_account_deleted: "Votre compte a été définitivement supprimé."
198 notice_user_successful_create: "Utilisateur %{id} créé."
198 notice_user_successful_create: "Utilisateur %{id} créé."
199 notice_new_password_must_be_different: Votre nouveau mot de passe doit être différent de votre mot de passe actuel
199
200
200 error_can_t_load_default_data: "Une erreur s'est produite lors du chargement du paramétrage : %{value}"
201 error_can_t_load_default_data: "Une erreur s'est produite lors du chargement du paramétrage : %{value}"
201 error_scm_not_found: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt."
202 error_scm_not_found: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt."
@@ -1108,3 +1108,5 gl:
1108 label_visibility_roles: to these roles only
1108 label_visibility_roles: to these roles only
1109 label_visibility_public: to any users
1109 label_visibility_public: to any users
1110 field_must_change_passwd: Must change password at next logon
1110 field_must_change_passwd: Must change password at next logon
1111 notice_new_password_must_be_different: The new password must be different from the
1112 current password
@@ -1102,3 +1102,5 he:
1102 label_visibility_roles: to these roles only
1102 label_visibility_roles: to these roles only
1103 label_visibility_public: to any users
1103 label_visibility_public: to any users
1104 field_must_change_passwd: Must change password at next logon
1104 field_must_change_passwd: Must change password at next logon
1105 notice_new_password_must_be_different: The new password must be different from the
1106 current password
@@ -1098,3 +1098,5 hr:
1098 label_visibility_roles: to these roles only
1098 label_visibility_roles: to these roles only
1099 label_visibility_public: to any users
1099 label_visibility_public: to any users
1100 field_must_change_passwd: Must change password at next logon
1100 field_must_change_passwd: Must change password at next logon
1101 notice_new_password_must_be_different: The new password must be different from the
1102 current password
@@ -1116,3 +1116,5
1116 label_visibility_roles: to these roles only
1116 label_visibility_roles: to these roles only
1117 label_visibility_public: to any users
1117 label_visibility_public: to any users
1118 field_must_change_passwd: Must change password at next logon
1118 field_must_change_passwd: Must change password at next logon
1119 notice_new_password_must_be_different: The new password must be different from the
1120 current password
@@ -1101,3 +1101,5 id:
1101 label_visibility_roles: to these roles only
1101 label_visibility_roles: to these roles only
1102 label_visibility_public: to any users
1102 label_visibility_public: to any users
1103 field_must_change_passwd: Must change password at next logon
1103 field_must_change_passwd: Must change password at next logon
1104 notice_new_password_must_be_different: The new password must be different from the
1105 current password
@@ -1096,3 +1096,5 it:
1096 label_visibility_roles: to these roles only
1096 label_visibility_roles: to these roles only
1097 label_visibility_public: to any users
1097 label_visibility_public: to any users
1098 field_must_change_passwd: Must change password at next logon
1098 field_must_change_passwd: Must change password at next logon
1099 notice_new_password_must_be_different: The new password must be different from the
1100 current password
@@ -1125,3 +1125,5 ja:
1125 label_visibility_roles: 以下のロールのみ
1125 label_visibility_roles: 以下のロールのみ
1126 label_visibility_public: すべてのユーザー
1126 label_visibility_public: すべてのユーザー
1127 field_must_change_passwd: Must change password at next logon
1127 field_must_change_passwd: Must change password at next logon
1128 notice_new_password_must_be_different: The new password must be different from the
1129 current password
@@ -1146,3 +1146,5 ko:
1146 label_visibility_roles: to these roles only
1146 label_visibility_roles: to these roles only
1147 label_visibility_public: to any users
1147 label_visibility_public: to any users
1148 field_must_change_passwd: Must change password at next logon
1148 field_must_change_passwd: Must change password at next logon
1149 notice_new_password_must_be_different: The new password must be different from the
1150 current password
@@ -1156,3 +1156,5 lt:
1156 label_visibility_roles: to these roles only
1156 label_visibility_roles: to these roles only
1157 label_visibility_public: to any users
1157 label_visibility_public: to any users
1158 field_must_change_passwd: Must change password at next logon
1158 field_must_change_passwd: Must change password at next logon
1159 notice_new_password_must_be_different: The new password must be different from the
1160 current password
@@ -1091,3 +1091,5 lv:
1091 label_visibility_roles: to these roles only
1091 label_visibility_roles: to these roles only
1092 label_visibility_public: to any users
1092 label_visibility_public: to any users
1093 field_must_change_passwd: Must change password at next logon
1093 field_must_change_passwd: Must change password at next logon
1094 notice_new_password_must_be_different: The new password must be different from the
1095 current password
@@ -1097,3 +1097,5 mk:
1097 label_visibility_roles: to these roles only
1097 label_visibility_roles: to these roles only
1098 label_visibility_public: to any users
1098 label_visibility_public: to any users
1099 field_must_change_passwd: Must change password at next logon
1099 field_must_change_passwd: Must change password at next logon
1100 notice_new_password_must_be_different: The new password must be different from the
1101 current password
@@ -1098,3 +1098,5 mn:
1098 label_visibility_roles: to these roles only
1098 label_visibility_roles: to these roles only
1099 label_visibility_public: to any users
1099 label_visibility_public: to any users
1100 field_must_change_passwd: Must change password at next logon
1100 field_must_change_passwd: Must change password at next logon
1101 notice_new_password_must_be_different: The new password must be different from the
1102 current password
@@ -1079,3 +1079,5 nl:
1079 label_visibility_roles: to these roles only
1079 label_visibility_roles: to these roles only
1080 label_visibility_public: to any users
1080 label_visibility_public: to any users
1081 field_must_change_passwd: Must change password at next logon
1081 field_must_change_passwd: Must change password at next logon
1082 notice_new_password_must_be_different: The new password must be different from the
1083 current password
@@ -1087,3 +1087,5
1087 label_visibility_roles: to these roles only
1087 label_visibility_roles: to these roles only
1088 label_visibility_public: to any users
1088 label_visibility_public: to any users
1089 field_must_change_passwd: Must change password at next logon
1089 field_must_change_passwd: Must change password at next logon
1090 notice_new_password_must_be_different: The new password must be different from the
1091 current password
@@ -1119,3 +1119,5 pl:
1119 label_visibility_roles: to these roles only
1119 label_visibility_roles: to these roles only
1120 label_visibility_public: to any users
1120 label_visibility_public: to any users
1121 field_must_change_passwd: Must change password at next logon
1121 field_must_change_passwd: Must change password at next logon
1122 notice_new_password_must_be_different: The new password must be different from the
1123 current password
@@ -1117,3 +1117,5 pt-BR:
1117 label_visibility_roles: to these roles only
1117 label_visibility_roles: to these roles only
1118 label_visibility_public: to any users
1118 label_visibility_public: to any users
1119 field_must_change_passwd: Must change password at next logon
1119 field_must_change_passwd: Must change password at next logon
1120 notice_new_password_must_be_different: The new password must be different from the
1121 current password
@@ -1104,3 +1104,5 pt:
1104 label_visibility_roles: to these roles only
1104 label_visibility_roles: to these roles only
1105 label_visibility_public: to any users
1105 label_visibility_public: to any users
1106 field_must_change_passwd: Must change password at next logon
1106 field_must_change_passwd: Must change password at next logon
1107 notice_new_password_must_be_different: The new password must be different from the
1108 current password
@@ -1092,3 +1092,5 ro:
1092 label_visibility_roles: to these roles only
1092 label_visibility_roles: to these roles only
1093 label_visibility_public: to any users
1093 label_visibility_public: to any users
1094 field_must_change_passwd: Must change password at next logon
1094 field_must_change_passwd: Must change password at next logon
1095 notice_new_password_must_be_different: The new password must be different from the
1096 current password
@@ -1207,3 +1207,5 ru:
1207 label_visibility_roles: только этим ролям
1207 label_visibility_roles: только этим ролям
1208 label_visibility_public: всем пользователям
1208 label_visibility_public: всем пользователям
1209 field_must_change_passwd: Must change password at next logon
1209 field_must_change_passwd: Must change password at next logon
1210 notice_new_password_must_be_different: The new password must be different from the
1211 current password
@@ -1094,3 +1094,5 sk:
1094 label_visibility_roles: to these roles only
1094 label_visibility_roles: to these roles only
1095 label_visibility_public: to any users
1095 label_visibility_public: to any users
1096 field_must_change_passwd: Must change password at next logon
1096 field_must_change_passwd: Must change password at next logon
1097 notice_new_password_must_be_different: The new password must be different from the
1098 current password
@@ -1097,3 +1097,5 sl:
1097 label_visibility_roles: to these roles only
1097 label_visibility_roles: to these roles only
1098 label_visibility_public: to any users
1098 label_visibility_public: to any users
1099 field_must_change_passwd: Must change password at next logon
1099 field_must_change_passwd: Must change password at next logon
1100 notice_new_password_must_be_different: The new password must be different from the
1101 current password
@@ -1093,3 +1093,5 sq:
1093 label_visibility_roles: to these roles only
1093 label_visibility_roles: to these roles only
1094 label_visibility_public: to any users
1094 label_visibility_public: to any users
1095 field_must_change_passwd: Must change password at next logon
1095 field_must_change_passwd: Must change password at next logon
1096 notice_new_password_must_be_different: The new password must be different from the
1097 current password
@@ -1099,3 +1099,5 sr-YU:
1099 label_visibility_roles: to these roles only
1099 label_visibility_roles: to these roles only
1100 label_visibility_public: to any users
1100 label_visibility_public: to any users
1101 field_must_change_passwd: Must change password at next logon
1101 field_must_change_passwd: Must change password at next logon
1102 notice_new_password_must_be_different: The new password must be different from the
1103 current password
@@ -1098,3 +1098,5 sr:
1098 label_visibility_roles: to these roles only
1098 label_visibility_roles: to these roles only
1099 label_visibility_public: to any users
1099 label_visibility_public: to any users
1100 field_must_change_passwd: Must change password at next logon
1100 field_must_change_passwd: Must change password at next logon
1101 notice_new_password_must_be_different: The new password must be different from the
1102 current password
@@ -1135,3 +1135,5 sv:
1135 label_visibility_roles: to these roles only
1135 label_visibility_roles: to these roles only
1136 label_visibility_public: to any users
1136 label_visibility_public: to any users
1137 field_must_change_passwd: Must change password at next logon
1137 field_must_change_passwd: Must change password at next logon
1138 notice_new_password_must_be_different: The new password must be different from the
1139 current password
@@ -1094,3 +1094,5 th:
1094 label_visibility_roles: to these roles only
1094 label_visibility_roles: to these roles only
1095 label_visibility_public: to any users
1095 label_visibility_public: to any users
1096 field_must_change_passwd: Must change password at next logon
1096 field_must_change_passwd: Must change password at next logon
1097 notice_new_password_must_be_different: The new password must be different from the
1098 current password
@@ -1116,3 +1116,5 tr:
1116 label_visibility_roles: to these roles only
1116 label_visibility_roles: to these roles only
1117 label_visibility_public: to any users
1117 label_visibility_public: to any users
1118 field_must_change_passwd: Must change password at next logon
1118 field_must_change_passwd: Must change password at next logon
1119 notice_new_password_must_be_different: The new password must be different from the
1120 current password
@@ -1092,3 +1092,5 uk:
1092 label_visibility_roles: to these roles only
1092 label_visibility_roles: to these roles only
1093 label_visibility_public: to any users
1093 label_visibility_public: to any users
1094 field_must_change_passwd: Must change password at next logon
1094 field_must_change_passwd: Must change password at next logon
1095 notice_new_password_must_be_different: The new password must be different from the
1096 current password
@@ -1150,3 +1150,5 vi:
1150 label_visibility_roles: to these roles only
1150 label_visibility_roles: to these roles only
1151 label_visibility_public: to any users
1151 label_visibility_public: to any users
1152 field_must_change_passwd: Must change password at next logon
1152 field_must_change_passwd: Must change password at next logon
1153 notice_new_password_must_be_different: The new password must be different from the
1154 current password
@@ -1178,3 +1178,5
1178 description_date_to: 輸入結束日期
1178 description_date_to: 輸入結束日期
1179 text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
1179 text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
1180 field_must_change_passwd: Must change password at next logon
1180 field_must_change_passwd: Must change password at next logon
1181 notice_new_password_must_be_different: The new password must be different from the
1182 current password
@@ -1101,3 +1101,5 zh:
1101 label_visibility_roles: to these roles only
1101 label_visibility_roles: to these roles only
1102 label_visibility_public: to any users
1102 label_visibility_public: to any users
1103 field_must_change_passwd: Must change password at next logon
1103 field_must_change_passwd: Must change password at next logon
1104 notice_new_password_must_be_different: The new password must be different from the
1105 current password
General Comments 0
You need to be logged in to leave comments. Login now