From c826e5a3416c1f3c8dbb7033620b86752d75f87a Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 20 Sep 2012 19:44:02 +0000 Subject: [PATCH] missing i18n change modal header title when asking skipping conflict or not git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1388179 13f79535-47bb-0310-9956-ffa450edef68 --- .../resources/org/apache/archiva/i18n/default.properties | 8 ++++++++ .../src/main/webapp/js/archiva/repositories.js | 3 +-- 2 files changed, 9 insertions(+), 2 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 2848daa57..e475ff8e3 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 @@ -100,6 +100,14 @@ skipPackedIndexCreation.help.content=Will prevent creating packed and incrementa managedrepository.actions=Actions managedrepository.repomerge.dialog.header=Choose a target repository for merging managedrepository.mergerepo=Merge this repository +managedrepository.merge.success={0} merged to {1} +managedrepository.merge.noartifacts=No artifacts to merge from repository {0} +managedrepository.merge.conflicts.header=Merging {0} to {1} +managedrepository.merge.conflicts=Merge has {0} conflicts +managedrepository.merge.domerge=Merge +managedrepository.merge.domerge.skipconflicts=Merge with skipping conflicts + + # remote repositories screen remoterepository.downloadremoteindex.now=Download Remote Index Now diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js index 132031560..ac5f12fb5 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js @@ -567,8 +567,6 @@ define("archiva.repositories",["jquery","i18n","jquery.tmpl","bootstrap","jquery } ); - - } @@ -597,6 +595,7 @@ define("archiva.repositories",["jquery","i18n","jquery.tmpl","bootstrap","jquery $.tmpl($("#merge-repo-skip-conflicts").html(), { artifacts:artifacts, sourceRepository: sourceRepository, targetRepository:targetRepository }) .appendTo( "#dialog-modal-merge-repo-body-text" ); + $("#dialog-modal-merge-repo-header-title" ).html($.i18n.prop("managedrepository.merge.conflicts.header",sourceRepository,targetRepository)); } else { doMerge(sourceRepository,targetRepository,false); } -- 2.39.5