From 6a13988040db49b0fcf16765b9b3e8ba99ae58c6 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 10 Aug 2012 08:32:23 +0200 Subject: [PATCH] fix wrong unarchive message --- scm-webapp/src/main/webapp/resources/js/i18n/de.js | 5 ++++- .../resources/js/repository/sonia.repository.panel.js | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) 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 dc28d1a37b..49e2b0d983 100644 --- a/scm-webapp/src/main/webapp/resources/js/i18n/de.js +++ b/scm-webapp/src/main/webapp/resources/js/i18n/de.js @@ -197,8 +197,11 @@ if (Sonia.repository.Panel){ archiveText: 'Archivieren', unarchiveText: 'Wiederherstellen', archiveTitleText: 'Repository archivieren', + unarchiveTitleText: 'Repository wiederherstellen', archiveMsgText: 'Repository "{0}" archivieren?', - errorArchiveMsgText: 'Das Archivieren des Repositories is fehlgeschlagen.', + unarchiveMsgText: 'Repository "{0}" wiederherstellen?', + errorArchiveMsgText: 'Das Archivieren des Repositories ist fehlgeschlagen.', + errorUnarchiveMsgText: 'Das Wiederherstellen des Repositories ist fehlgeschlagen.', displayArchivedRepositoriesText: 'Archiv', emptyText: 'Es wurde kein Repository selektiert', diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js index 9f07526a5f..b63cf00008 100644 --- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js +++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js @@ -38,8 +38,11 @@ Sonia.repository.Panel = Ext.extend(Sonia.rest.Panel, { archiveText: 'Archive', unarchiveText: 'Unarchive', archiveTitleText: 'Archive Repository', + unarchiveTitleText: 'Unarchive Repository', archiveMsgText: 'Archive Repository "{0}"?', + unarchiveMsgText: 'Unarchive Repository "{0}"?', errorArchiveMsgText: 'Repository archival failed', + errorUnarchiveMsgText: 'Repository unarchival failed', displayArchivedRepositoriesText: 'Archive', removeTitleText: 'Remove Repository', @@ -295,14 +298,17 @@ Sonia.repository.Panel = Ext.extend(Sonia.rest.Panel, { toggleArchive: function(){ var item = this.getSelectedRepository(); if ( item ){ + + var title = item.archived ? this.unarchiveTitleText : this.archiveTitleText; + var msg = item.archived ? this.unarchiveMsgText : this.archiveMsgText; + item.archived = ! item.archived; if (debug){ console.debug('toggle repository ' + item.name + ' archive to ' + item.archived); } var url = restUrl + 'repositories/' + item.id + '.json'; - this.executeRemoteCall(this.archiveTitleText, - String.format(this.archiveMsgText, item.name), + this.executeRemoteCall(title, String.format(msg, item.name), 'PUT', url, item, function(result){ main.handleFailure( result.status,