From 535a23a760455cc86185a6aaa7d96d2afbeee308 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sat, 31 Mar 2012 19:16:05 +0200 Subject: [PATCH] improve german locale --- .../js/action/sonia.action.exceptionwindow.js | 3 +- .../js/config/sonia.config.scmconfigpanel.js | 4 --- .../src/main/webapp/resources/js/i18n/de.js | 36 +++++++++++++++++-- .../resources/js/plugin/sonia.plugin.grid.js | 1 - .../sonia.repository.importwindow.js | 1 - .../src/main/webapp/resources/js/sonia.scm.js | 3 -- 6 files changed, 34 insertions(+), 14 deletions(-) diff --git a/scm-webapp/src/main/webapp/resources/js/action/sonia.action.exceptionwindow.js b/scm-webapp/src/main/webapp/resources/js/action/sonia.action.exceptionwindow.js index 59a9d89e59..11723da927 100644 --- a/scm-webapp/src/main/webapp/resources/js/action/sonia.action.exceptionwindow.js +++ b/scm-webapp/src/main/webapp/resources/js/action/sonia.action.exceptionwindow.js @@ -36,8 +36,7 @@ Sonia.action.ExceptionWindow = Ext.extend(Ext.Window,{ message: null, stacktrace: null, icon: Ext.MessageBox.ERROR, - - // TODO i18n + // labels okText: 'Ok', detailsText: 'Details', diff --git a/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js b/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js index 78ad33cc14..97710cfabf 100644 --- a/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js +++ b/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js @@ -56,8 +56,6 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{ proxyPasswordText: 'Proxy Password', baseUrlText: 'Base Url', forceBaseUrlText: 'Force Base Url', - - // TODO i18n disableGroupingGridText: 'Disable repository Groups', @@ -82,8 +80,6 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{ proxyPasswordHelpText: 'The password for the proxy server authentication.', baseUrlHelpText: 'The url of the application (with context path) i.e. http://localhost:8080/scm', forceBaseUrlHelpText: 'Redirects to the base url if the request comes from a other url', - - // TODO i18n disableGroupingGridHelpText: 'Disable repository Groups. A complete page reload is required after a change of this value.', diff --git a/scm-webapp/src/main/webapp/resources/js/i18n/de.js b/scm-webapp/src/main/webapp/resources/js/i18n/de.js index 51921a45a7..5f44ca6d51 100644 --- a/scm-webapp/src/main/webapp/resources/js/i18n/de.js +++ b/scm-webapp/src/main/webapp/resources/js/i18n/de.js @@ -257,6 +257,16 @@ if (Sonia.repository.ChangesetViewerGrid){ } +if (Sonia.repository.ImportWindow){ + + Ext.override(Sonia.repository.ImportWindow, { + titleText: 'Repositories importieren', + okText: 'Ok', + closeText: 'Schließen' + }); + +} + // sonia.config.js if (Sonia.config.ScmConfigPanel){ @@ -281,6 +291,7 @@ if (Sonia.config.ScmConfigPanel){ proxyPasswordText: 'Proxy Passwort', baseUrlText: 'Basis-URL', forceBaseUrlText: 'Basis-URL forcieren', + disableGroupingGridText: 'Repository grupierung deaktivieren', submitText: 'Senden ...', loadingText: 'Laden ...', @@ -308,7 +319,8 @@ if (Sonia.config.ScmConfigPanel){ proxyUserHelpText: 'Der Benutzername für die Authentifizierung am Proxy-Server.', proxyPasswordHelpText: 'Das Passwort für die Authentifizierung am Proxy-Server.', baseUrlHelpText: 'Die vollständige URL des Server, inclusive Context-Pfad z.B.: http://localhost:8080/scm.', - forceBaseUrlHelpText: 'Leitet alle Zugriffe die nicht von der Basis-URL kommen auf die Basis-URL um.' + forceBaseUrlHelpText: 'Leitet alle Zugriffe die nicht von der Basis-URL kommen auf die Basis-URL um.', + disableGroupingGridHelpText: 'Repository grupierung deaktivieren. Wenn dieser Wert verändert wird muss die Seite ne geladen werden.' }); } @@ -467,6 +479,17 @@ if (Sonia.action.ChangePasswordWindow){ } +if (Sonia.action.ExceptionWindow){ + + // ?? + Ext.override(Sonia.action.ExceptionWindow, { + okText: 'Ok', + detailsText: 'Details', + exceptionText: 'Exception' + }); + +} + // sonia.plugin.js if (Sonia.plugin.Center){ @@ -500,6 +523,7 @@ if (Sonia.plugin.Grid){ colVersionText: 'Version', colActionText: 'Aktion', colUrlText: 'Url', + colCategoryText: 'Kategorie', emptyText: 'Es konnte kein Plugin gefunden werden.' }); @@ -518,8 +542,8 @@ if (Sonia.scm.Main){ sectionConfigText: 'Konfiguration', navGeneralConfigText: 'Allgemein', tabGeneralConfigText: 'SCM Konfiguration', - navRepositoryTypesText: 'Repository Konfiguration', + navImportRepositoriesText: 'Repositories importieren', tabRepositoryTypesText: 'Repository Konfiguration', navPluginsText: 'Plugins', tabPluginsText: 'Plugins', @@ -540,7 +564,13 @@ if (Sonia.scm.Main){ errorMessage: 'Es ist ein unbekannter Fehler aufgetreten.', errorSessionExpiredTitle: 'Session abgelaufen', - errorSessionExpiredMessage: 'Ihre Session ist abgelaufen. Bitte melden sie sich neu an.' + errorSessionExpiredMessage: 'Ihre Session ist abgelaufen. Bitte melden sie sich neu an.', + + errorNoPermissionsTitle: 'Keine Berechtigung', + errorNoPermissionsMessage: 'Sie haben nicht genügend Rechte um diese Aktion auszuführen.', + + errorNotFoundTitle: 'Nicht gefunden', + errorNotFoundMessage: 'Die Ressource konnte nicht gefunden werden.' }); } diff --git a/scm-webapp/src/main/webapp/resources/js/plugin/sonia.plugin.grid.js b/scm-webapp/src/main/webapp/resources/js/plugin/sonia.plugin.grid.js index 8d295de674..59a165ef1e 100644 --- a/scm-webapp/src/main/webapp/resources/js/plugin/sonia.plugin.grid.js +++ b/scm-webapp/src/main/webapp/resources/js/plugin/sonia.plugin.grid.js @@ -42,7 +42,6 @@ Sonia.plugin.Grid = Ext.extend(Sonia.rest.Grid, { colVersionText: 'Version', colActionText: 'Action', colUrlText: 'Url', - // TODO i18n colCategoryText: 'Category', emptyText: 'No plugins avaiable', diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.importwindow.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.importwindow.js index d3b22637d2..10d276eccc 100644 --- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.importwindow.js +++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.importwindow.js @@ -31,7 +31,6 @@ Sonia.repository.ImportWindow = Ext.extend(Ext.Window,{ - // TODO i18n titleText: 'Import Repositories', okText: 'Ok', closeText: 'Close', diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.scm.js b/scm-webapp/src/main/webapp/resources/js/sonia.scm.js index d50a1116bd..d64bff87a0 100644 --- a/scm-webapp/src/main/webapp/resources/js/sonia.scm.js +++ b/scm-webapp/src/main/webapp/resources/js/sonia.scm.js @@ -33,7 +33,6 @@ Ext.ns("Sonia.scm"); Sonia.scm.Main = Ext.extend(Ext.util.Observable, { tabRepositoriesText: 'Repositories', - // todo i18n navImportRepositoriesText: 'Import Repositories', navChangePasswordText: 'Change Password', sectionMainText: 'Main', @@ -66,8 +65,6 @@ Sonia.scm.Main = Ext.extend(Ext.util.Observable, { errorSessionExpiredTitle: 'Session expired', errorSessionExpiredMessage: 'Your session is expired. Please relogin.', - // TODO i18n - errorNoPermissionsTitle: 'Not permitted', errorNoPermissionsMessage: 'You have not enough permissions to execute this action.',