Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2012-09-20 19:44:02 +00:00
parent 95e33a5534
commit c826e5a341
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
View File

@ -100,6 +100,14 @@ skipPackedIndexCreation.help.content=Will prevent creating packed and incrementa
managedrepository.actions=Actions managedrepository.actions=Actions
managedrepository.repomerge.dialog.header=Choose a target repository for merging managedrepository.repomerge.dialog.header=Choose a target repository for merging
managedrepository.mergerepo=Merge this repository 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 # remote repositories screen
remoterepository.downloadremoteindex.now=Download Remote Index Now remoterepository.downloadremoteindex.now=Download Remote Index Now

3
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
View File

@ -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(), $.tmpl($("#merge-repo-skip-conflicts").html(),
{ artifacts:artifacts, sourceRepository: sourceRepository, targetRepository:targetRepository }) { artifacts:artifacts, sourceRepository: sourceRepository, targetRepository:targetRepository })
.appendTo( "#dialog-modal-merge-repo-body-text" ); .appendTo( "#dialog-modal-merge-repo-body-text" );
$("#dialog-modal-merge-repo-header-title" ).html($.i18n.prop("managedrepository.merge.conflicts.header",sourceRepository,targetRepository));
} else { } else {
doMerge(sourceRepository,targetRepository,false); doMerge(sourceRepository,targetRepository,false);
} }