From 25412cf692f7626860beeb5fae3c4151c1138a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Thu, 23 Feb 2023 11:45:42 +0100 Subject: [PATCH 1/2] feature/Renamed props language_tag to default_locale, default is en_GB --- src/main/resources/props/sample.props.template | 6 +++++- src/main/scala/code/util/I18NUtil.scala | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/resources/props/sample.props.template b/src/main/resources/props/sample.props.template index b3c8ab8a..e8c1aeb6 100644 --- a/src/main/resources/props/sample.props.template +++ b/src/main/resources/props/sample.props.template @@ -178,4 +178,8 @@ dev.port=8082 # oauth2.jws_alg=ES256 # oauth2.jwk_private_key= # Example of the above value: {"kty":"EC","d":"mQ6yDqYB84z027rZoKnr9JIloX7QqyM0QDScHmWIb-s","use":"sig","crv":"P-256","kid":"c14e9b43-d69b-431e-a90b-eac0dd2e59f8","x":"mNBOFk1w7EYZ194LPCKlNn-NbflCkdxPHGh3VmCj13U","y":"4oXertw5ECdy_ApfG_LG5n92Q9-QlPr9Bt3eM_Z9DeI","alg":"ES256"} -# ------------------------------ Identity Provider OAuth2 Props end -------------------------- \ No newline at end of file +# ------------------------------ Identity Provider OAuth2 Props end -------------------------- + + +# Please note that depricated name ot this props is: language_tag +default_locale = en_GB \ No newline at end of file diff --git a/src/main/scala/code/util/I18NUtil.scala b/src/main/scala/code/util/I18NUtil.scala index 649dd130..84ac20c8 100644 --- a/src/main/scala/code/util/I18NUtil.scala +++ b/src/main/scala/code/util/I18NUtil.scala @@ -17,7 +17,7 @@ object I18NUtil { } def getLocale(): Locale = Locale.getAvailableLocales().toList.filter { l => - l.toLanguageTag == Props.get("language_tag", "en-GB") + l.toLanguageTag == Props.get("default_locale", "en-GB") }.headOption.getOrElse(Locale.ENGLISH) def currentLocale() : Locale = { From 3fa73ce48bc36ce99be7866eae57c2c474933017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Thu, 23 Feb 2023 15:06:38 +0100 Subject: [PATCH 2/2] bugfix/Fix issue in case that default_locale props is set --- .../resources/i18n/lift-core_en_GB.properties | 395 ++++++++++++++++++ src/main/scala/bootstrap/liftweb/Boot.scala | 2 +- src/main/scala/code/util/I18NUtil.scala | 2 +- 3 files changed, 397 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/i18n/lift-core_en_GB.properties diff --git a/src/main/resources/i18n/lift-core_en_GB.properties b/src/main/resources/i18n/lift-core_en_GB.properties new file mode 100644 index 00000000..140c4bdf --- /dev/null +++ b/src/main/resources/i18n/lift-core_en_GB.properties @@ -0,0 +1,395 @@ +api.explorer = Explorador API +invalid.email.address = Invalid email address +password.must.be.set = Password must be set +password.too.short = Password too short +passwords.do.not.match = Passwords do not match +number.required = A numeric value must be provided +ajax.error=The server cannot be contacted at this time +invalid.zip.code = Invalid ZIP code +invalid.postal.code = Invalid postal code +unique.email.address = The email address must be unique +must.be.logged.in = You must be logged in +already.logged.in = already logged in. Please logout first. +login = Login +logout = Logout +log.in = Log In +log.out = Log Out +sign.up = Sign Up +logged.in = Logged In +logout.first = Please logout first. +lost.password = Lost Password +reset.password = Reset Password +change.password = Change Password +password.changed = Password Changed +edit.user = Edit User +validate.user = Validate User +edit.profile = Edit Profile +sign.up.confirmation = Sign up confirmation +sign.up.message = You have signed up. A validation email message will be sent to you. +sign.up.validation.link=Click on this link to complete signup: +welcome = Welcome +account.validated = Account Validated +invalid.validation.link = Validation link invalid +account.validation.error = Your account has not been validated. Please check your email for a validation link. +invalid.credentials = Invalid Username/Password +enter.email = Enter your email address and we'll email you a link to reset your password +email.address = Email address +reset.password.confirmation = Reset Password Confirmation +dear = Dear +click.reset.link = Click on this link to reset your password +thank.you = Thank you +reset.password.request = Reset Password Request +password.reset.email.sent = Password Reset Email sent +account.validation.resent = Account Validation Re-sent +email.address.not.found = Email address not found +send.it = Send It +reset.your.password = Reset your password +enter.your.new.password = Enter your new password +repeat.your.new.password = Enter your new password (repeat) +set.password = Set Password +password.link.invalid = Password reset link invalid +wrong.old.password = Wrong old password +old.password = Old password +new.password = New password +repeat.password = New password (repeat) +repeat = Repeat +edit = Edit +cancel = Cancel +ok = OK +change = Change +password = Password +recover.password = Recover Password +profile.updated = You have updated your profile +male = Male +female = Female +first.name = First name +last.name = Last name +locale = Locale +time.zone = Time Zone +msg.notice = Notice +msg.warning = Warning +msg.error = Error +crudify.menu.view.displayName=View %s +crudify.menu.edit.displayName=Edit %s +crudify.menu.delete.displayName=Delete %s +paginator.norecords = There are no records to display +paginator.displayingrecords = Displaying %s-%s of %s +# Country names +country_1 = United States +country_2 = Afghanistan +country_3 = Albania +country_4 = Algeria +country_5 = Andorra +country_6 = Angola +country_7 = Antigua and Barbuda +country_8 = Argentina +country_9 = Armenia +country_10 = Australia +country_11 = Austria +country_12 = Azerbaijan +country_13 = Bahamas, The +country_14 = Bahrain +country_15 = Bangladesh +country_16 = Barbados +country_17 = Belarus +country_18 = Belgium +country_19 = Belize +country_20 = Benin +country_21 = Bhutan +country_22 = Bolivia +country_23 = Bosnia and Herzegovina +country_24 = Botswana +country_25 = Brazil +country_26 = Brunei +country_27 = Bulgaria +country_28 = Burkina Faso +country_29 = Burundi +country_30 = Cambodia +country_31 = Cameroon +country_32 = Canada +country_33 = Cape Verde +country_34 = Central African Republic +country_35 = Chad +country_36 = Chile +country_37 = China, People's Republic of +country_38 = Colombia +country_39 = Comoros +country_40 = Congo, Democratic Republic of the (Congo Kinshasa) +country_41 = Congo, Republic of the (Congo Brazzaville) +country_42 = Costa Rica +country_43 = Cote d'Ivoire (Ivory Coast) +country_44 = Croatia +country_45 = Cuba +country_46 = Cyprus +country_47 = Czech Republic +country_48 = Denmark +country_49 = Djibouti +country_50 = Dominica +country_51 = Dominican Republic +country_52 = Ecuador +country_53 = Egypt +country_54 = El Salvador +country_55 = Equatorial Guinea +country_56 = Eritrea +country_57 = Estonia +country_58 = Ethiopia +country_59 = Fiji +country_60 = Finland +country_61 = France +country_62 = Gabon +country_63 = Gambia, The +country_64 = Georgia +country_65 = Germany +country_66 = Ghana +country_67 = Greece +country_68 = Grenada +country_69 = Guatemala +country_70 = Guinea +country_71 = Guinea-Bissau +country_72 = Guyana +country_73 = Haiti +country_74 = Honduras +country_75 = Hungary +country_76 = Iceland +country_77 = India +country_78 = Indonesia +country_79 = Iran +country_80 = Iraq +country_81 = Ireland +country_82 = Israel +country_83 = Italy +country_84 = Jamaica +country_85 = Japan +country_86 = Jordan +country_87 = Kazakhstan +country_88 = Kenya +country_89 = Kiribati +country_90 = Korea, Democratic People's Republic of (North Korea) +country_91 = Korea, Republic of (South Korea) +country_92 = Kuwait +country_93 = Kyrgyzstan +country_94 = Laos +country_95 = Latvia +country_96 = Lebanon +country_97 = Lesotho +country_98 = Liberia +country_99 = Libya +country_100 = Liechtenstein +country_101 = Lithuania +country_102 = Luxembourg +country_103 = Macedonia +country_104 = Madagascar +country_105 = Malawi +country_106 = Malaysia +country_107 = Maldives +country_108 = Mali +country_109 = Malta +country_110 = Marshall Islands +country_111 = Mauritania +country_112 = Mauritius +country_113 = Mexico +country_114 = Micronesia +country_115 = Moldova +country_116 = Monaco +country_117 = Mongolia +country_118 = Montenegro +country_119 = Morocco +country_120 = Mozambique +country_121 = Myanmar (Burma) +country_122 = Namibia +country_123 = Nauru +country_124 = Nepal +country_125 = Netherlands +country_126 = New Zealand +country_127 = Nicaragua +country_128 = Niger +country_129 = Nigeria +country_130 = Norway +country_131 = Oman +country_132 = Pakistan +country_133 = Palau +country_134 = Panama +country_135 = Papua New Guinea +country_136 = Paraguay +country_137 = Peru +country_138 = Philippines +country_139 = Poland +country_140 = Portugal +country_141 = Qatar +country_142 = Romania +country_143 = Russia +country_144 = Rwanda +country_145 = Saint Kitts and Nevis +country_146 = Saint Lucia +country_147 = Saint Vincent and the Grenadines +country_148 = Samoa +country_149 = San Marino +country_150 = Sao Tome and Principe +country_151 = Saudi Arabia +country_152 = Senegal +country_153 = Serbia +country_154 = Seychelles +country_155 = Sierra Leone +country_156 = Singapore +country_157 = Slovakia +country_158 = Slovenia +country_159 = Solomon Islands +country_160 = Somalia +country_161 = South Africa +country_162 = Spain +country_163 = Sri Lanka +country_164 = Sudan +country_165 = Suriname +country_166 = Swaziland +country_167 = Sweden +country_168 = Switzerland +country_169 = Syria +country_170 = Tajikistan +country_171 = Tanzania +country_172 = Thailand +country_173 = Timor-Leste (East Timor) +country_174 = Togo +country_175 = Tonga +country_176 = Trinidad and Tobago +country_177 = Tunisia +country_178 = Turkey +country_179 = Turkmenistan +country_180 = Tuvalu +country_181 = Uganda +country_182 = Ukraine +country_183 = United Arab Emirates +country_184 = United Kingdom +country_185 = Uruguay +country_186 = Uzbekistan +country_187 = Vanuatu +country_188 = Vatican City +country_189 = Venezuela +country_190 = Vietnam +country_191 = Yemen +country_192 = Zambia +country_193 = Zimbabwe +country_194 = Abkhazia +country_195 = China, Republic of (Taiwan) +country_196 = Nagorno-Karabakh +country_197 = Northern Cyprus +country_198 = Pridnestrovie (Transnistria) +country_199 = Somaliland +country_200 = South Ossetia +country_201 = Ashmore and Cartier Islands +country_202 = Christmas Island +country_203 = Cocos (Keeling) Islands +country_204 = Coral Sea Islands +country_205 = Heard Island and McDonald Islands +country_206 = Norfolk Island +country_207 = New Caledonia +country_208 = French Polynesia +country_209 = Mayotte +country_210 = Saint Barthelemy +country_211 = Saint Martin +country_212 = Saint Pierre and Miquelon +country_213 = Wallis and Futuna +country_214 = French Southern and Antarctic Lands +country_215 = Clipperton Island +country_216 = Bouvet Island +country_217 = Cook Islands +country_218 = Niue +country_219 = Tokelau +country_220 = Guernsey +country_221 = Isle of Man +country_222 = Jersey +country_223 = Anguilla +country_224 = Bermuda +country_225 = British Indian Ocean Territory +country_226 = British Sovereign Base Areas +country_227 = British Virgin Islands +country_228 = Cayman Islands +country_229 = Falkland Islands (Islas Malvinas) +country_230 = Gibraltar +country_231 = Montserrat +country_232 = Pitcairn Islands +country_233 = Saint Helena +country_234 = South Georgia and the South Sandwich Islands +country_235 = Turks and Caicos Islands +country_236 = Northern Mariana Islands +country_237 = Puerto Rico +country_238 = American Samoa +country_239 = Baker Island +country_240 = Guam +country_241 = Howland Island +country_242 = Jarvis Island +country_243 = Johnston Atoll +country_244 = Kingman Reef +country_245 = Midway Islands +country_246 = Navassa Island +country_247 = Palmyra Atoll +country_248 = U.S. Virgin Islands +country_249 = Wake Island +country_250 = Hong Kong +country_251 = Macau +country_252 = Faroe Islands +country_253 = Greenland +country_254 = French Guiana +country_255 = Guadeloupe +country_256 = Martinique +country_257 = Reunion +country_258 = Aland +country_259 = Aruba +country_260 = Netherlands Antilles +country_261 = Svalbard +country_262 = Ascension +country_263 = Tristan da Cunha +country_264 = Antarctica +country_265 = Kosovo +country_266 = Palestinian Territories (Gaza Strip and West Bank) +country_267 = Western Sahara +country_268 = Australian Antarctic Territory +country_269 = Ross Dependency +country_270 = Peter I Island +country_271 = Queen Maud Land +country_272 = British Antarctic Territory +# LiftScreen + Wizard +Next = Next +Previous = Previous +Finish = Finish +Cancel = Cancel + +# Crudify +Create = Create +Save = Save +Edit = Edit +Delete = Delete +delete = delete +View = View +List = List %s +Created = Created +Edited = Edited +Deleted = Deleted + +#OBP specific fields +consumer.registration.nav.name=Get API Key +invalid.login.credentials=Invalid Login Credentials +invalid.username=Invalid Username: \ +1) The ONLY allowed characters in Usernames are: a-z A-Z 0-9 . _ \ +2) Usernames MUST be between 8 and 100 characters long \ +3) Usernames MUST NOT start with _ or . \ +4) Usernames MUST NOT contain __ or ._ or ._ or .. \ +5) Usernames MUST NOT end with _ or . \ +6) Any valid email address is allowed as the Username + +your.username.is.not.unique = Your username is not unique. Please enter a different one. +# Those 2 messages must have the same output in order to prevent leakage of information +user.invitation.is.already.finished = Looks like the invitation link is invalid. Still need help? Please send us a message using API Playground Support. +your.secret.link.is.not.valid = Looks like the invitation link is invalid. Still need help? Please send us a message using API Playground Support. + +# Drop down menu related translations +dropdownbox.select.bank=Select Bank +dropdownbox.select.account=Select Account +dropdownbox.select.view=Select View +dropdownbox.login.for.view=Login for View +dropdownbox.select.couterparty=Select Counterparty +dropdownbox.login.for.couterparty=Login for CPs +dropdownbox.select.transaction=Select Transaction +dropdownbox.login.for.transaction=Login for Transactions + +# Copy text to clipboard +clipboard.copy.text = Copy text \ No newline at end of file diff --git a/src/main/scala/bootstrap/liftweb/Boot.scala b/src/main/scala/bootstrap/liftweb/Boot.scala index ed04ed38..9fc34e3d 100755 --- a/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/src/main/scala/bootstrap/liftweb/Boot.scala @@ -65,7 +65,7 @@ class Boot extends MdcLoggable{ LiftRules.explicitlyParsedSuffixes = Helpers.knownSuffixes &~ (Set("com")) val locale = I18NUtil.getLocale() - Locale.setDefault(locale) + // Locale.setDefault(locale) // TODO Test why this case strange behaviour logger.info("Default Project Locale is :" + locale) // Cookie name diff --git a/src/main/scala/code/util/I18NUtil.scala b/src/main/scala/code/util/I18NUtil.scala index 84ac20c8..fc047508 100644 --- a/src/main/scala/code/util/I18NUtil.scala +++ b/src/main/scala/code/util/I18NUtil.scala @@ -17,7 +17,7 @@ object I18NUtil { } def getLocale(): Locale = Locale.getAvailableLocales().toList.filter { l => - l.toLanguageTag == Props.get("default_locale", "en-GB") + l.toString == Props.get("default_locale", "en_GB") }.headOption.getOrElse(Locale.ENGLISH) def currentLocale() : Locale = {