From cbbfd4e0c932232792389e92701abf929353178b Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 29 Dec 2012 21:07:44 +0000 Subject: [PATCH] use i18n for welcome badge git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1426834 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/archiva/i18n/default.properties | 1 + .../src/main/webapp/js/archiva/archiva.js | 152 +++++++++--------- .../src/main/webapp/js/redback/user.js | 2 +- 3 files changed, 78 insertions(+), 77 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties index 35b0ecdc4..d6b036c94 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties @@ -245,6 +245,7 @@ user.delete.message=The following user {0} will be deleted password.reset=Reset Password password.reset.success=Password reset. rememberme=Remember Me +user.login.welcome=Welcome {0} #roles management roles.management.header=Roles Management diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js index 6c3bd992a..4bfb95e5c 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js @@ -42,86 +42,86 @@ $.ajax({ cache: false, success:function(data){ - window.archivaDevMode=data.devMode; - window.archivaJavascriptLog=data.javascriptLog; - window.archivaRuntimeInfo=data; + window.archivaDevMode=data.devMode; + window.archivaJavascriptLog=data.javascriptLog; + window.archivaRuntimeInfo=data; - requirejs.config({ - baseUrl: "js/", - urlArgs: ""+appendJsNoCacheUrl(), - shim: { - 'sammy':['jquery','jquery.tmpl'], - 'archiva.main':['jquery','jquery.ui','sammy','jquery.tmpl','utils','i18n'], - 'utils':['jquery','jquery.tmpl','i18n'], - 'archiva.templates': ['jquery','jquery.tmpl','utils'], - 'redback.templates': ['jquery','jquery.tmpl','utils'] - }, - paths: { - "i18n":"jquery.i18n.properties-1.0.9", - "jquery": "jquery-1.8.3.min", - "jquery.tmpl": "jquery.tmpl", - "utils": "archiva/utils", - "startup": "archiva/startup", - "jquery.ui": "jquery-ui-1.9.2.custom.min", - "jquery.ui.widget": "jquery.ui.widget-1.9.2", - "jquery.cookie": "jquery.cookie.1.0.0", - "bootstrap": "bootstrap.2.2.1", - "jquery.validate": "jquery.validate-1.9.0", - "jquery.json": "jquery.json-2.3.min", - "knockout": "knockout-2.2.0.debug", - "knockout.simpleGrid": "knockout.simpleGrid", - "knockout.sortable": "knockout-sortable", - "jquery.iframe.transport": "jquery.iframe-transport-1.4", - "jquery.fileupload": "jquery.fileupload-5.10.0", - "jquery.fileupload.ip":"jquery.fileupload-ip-1.0.6", - "jquery.fileupload.ui":"jquery.fileupload-ui-6.6.3", - "tmpl": "tmpl.min", - "purl": "purl-2.2.1", - "prettify": "prettify", - "sammy": "sammy.0.7.1", - "select2": "select2.min-3.2", - "jqueryFileTree": "jqueryFileTree-1.0.1", - "redback": "redback/redback", - "redback.roles": "redback/roles", - "redback.user": "redback/user", - "redback.users": "redback/users", - "redback.templates": "redback/redback-tmpl", - "archiva.general-admin":"archiva/general-admin", - "archiva.templates": "archiva/main-tmpl", - "archiva.repositories": "archiva/repositories", - "archiva.network-proxies": "archiva/network-proxies", - "archiva.proxy-connectors": "archiva/proxy-connectors", - "archiva.repository-groups": "archiva/repository-groups", - "archiva.artifacts-management": "archiva/artifacts-management", - "archiva.search": "archiva/search", - "archiva.proxy-connectors-rules": "archiva/proxy-connectors-rules", - "archiva.docs": "archiva/docs", - "archiva.main": "archiva/main" - } - }); + requirejs.config({ + baseUrl: "js/", + urlArgs: ""+appendJsNoCacheUrl(), + shim: { + 'sammy':['jquery','jquery.tmpl'], + 'archiva.main':['jquery','jquery.ui','sammy','jquery.tmpl','utils','i18n'], + 'utils':['jquery','jquery.tmpl','i18n'], + 'archiva.templates': ['jquery','jquery.tmpl','utils'], + 'redback.templates': ['jquery','jquery.tmpl','utils'] + }, + paths: { + "i18n":"jquery.i18n.properties-1.0.9", + "jquery": "jquery-1.8.3.min", + "jquery.tmpl": "jquery.tmpl", + "utils": "archiva/utils", + "startup": "archiva/startup", + "jquery.ui": "jquery-ui-1.9.2.custom.min", + "jquery.ui.widget": "jquery.ui.widget-1.9.2", + "jquery.cookie": "jquery.cookie.1.0.0", + "bootstrap": "bootstrap.2.2.1", + "jquery.validate": "jquery.validate-1.9.0", + "jquery.json": "jquery.json-2.3.min", + "knockout": "knockout-2.2.0.debug", + "knockout.simpleGrid": "knockout.simpleGrid", + "knockout.sortable": "knockout-sortable", + "jquery.iframe.transport": "jquery.iframe-transport-1.4", + "jquery.fileupload": "jquery.fileupload-5.10.0", + "jquery.fileupload.ip":"jquery.fileupload-ip-1.0.6", + "jquery.fileupload.ui":"jquery.fileupload-ui-6.6.3", + "tmpl": "tmpl.min", + "purl": "purl-2.2.1", + "prettify": "prettify", + "sammy": "sammy.0.7.1", + "select2": "select2.min-3.2", + "jqueryFileTree": "jqueryFileTree-1.0.1", + "redback": "redback/redback", + "redback.roles": "redback/roles", + "redback.user": "redback/user", + "redback.users": "redback/users", + "redback.templates": "redback/redback-tmpl", + "archiva.general-admin":"archiva/general-admin", + "archiva.templates": "archiva/main-tmpl", + "archiva.repositories": "archiva/repositories", + "archiva.network-proxies": "archiva/network-proxies", + "archiva.proxy-connectors": "archiva/proxy-connectors", + "archiva.repository-groups": "archiva/repository-groups", + "archiva.artifacts-management": "archiva/artifacts-management", + "archiva.search": "archiva/search", + "archiva.proxy-connectors-rules": "archiva/proxy-connectors-rules", + "archiva.docs": "archiva/docs", + "archiva.main": "archiva/main" + } + }); - requirejs(['jquery','jquery.tmpl','jquery.ui','i18n','sammy','startup','utils','domReady!','archiva.main','archiva.general-admin'], function () { - loadi18n(function () { - $.ajax({ - url: "restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(), - dataType: 'json', - success:function(data){ - window.archivaDevMode=data.devMode; - window.archivaJavascriptLog=data.javascriptLog; - window.archivaRuntimeInfo=data; + requirejs(['jquery','jquery.tmpl','jquery.ui','i18n','sammy','startup','utils','domReady!','archiva.main','archiva.general-admin'], function () { + loadi18n(function () { + $.ajax({ + url: "restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(), + dataType: 'json', + success:function(data){ + window.archivaDevMode=data.devMode; + window.archivaJavascriptLog=data.javascriptLog; + window.archivaRuntimeInfo=data; - window.redbackRuntimeConfiguration=mapRedbackRuntimeConfiguration(data.redbackRuntimeConfiguration); + window.redbackRuntimeConfiguration=mapRedbackRuntimeConfiguration(data.redbackRuntimeConfiguration); - $.log("security.rememberme.enabled key value:"+ window.redbackRuntimeConfiguration.findPropertyValue('security.rememberme.enabled')); + $.log("security.rememberme.enabled key value:"+ window.redbackRuntimeConfiguration.findPropertyValue('security.rememberme.enabled')); - require(['sammy','jquery','i18n','jquery.tmpl','archiva.main','utils','domReady!'],function () { - startArchivaApplication(); - $("#loadingDiv").hide(); - drawQuickSearchAutocomplete(); - }) - } - }) - }); - }) + require(['sammy','jquery','i18n','jquery.tmpl','archiva.main','utils','domReady!'],function () { + startArchivaApplication(); + $("#loadingDiv").hide(); + drawQuickSearchAutocomplete(); + }) + } + }) + }); + }); } }); diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js index 732a8eb80..630d9e9f0 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js @@ -446,7 +446,7 @@ function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,purl) { clearForm("#user-login-form"); decorateMenuWithKarma(user); $("#login-welcome" ).show(); - $("#welcome-label" ).html("Welcome " + user.username()); + $("#welcome-label" ).html( $.i18n.prop("user.login.welcome",user.username())); return; } var modalLoginErrMsg=$("#modal-login-err-message"); -- 2.39.5