From 71e9efb152c07838574f731e184a323236b51358 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 25 Feb 2012 10:52:08 -0500
Subject: [PATCH] Add titles to error and photo upload popups (#1488354)
---
program/localization/de_DE/labels.inc | 1 +
program/localization/de_DE/messages.inc | 1 +
skins/larry/includes/footer.html | 1 +
program/localization/de_CH/messages.inc | 1 +
program/localization/en_US/messages.inc | 1 +
program/localization/en_US/labels.inc | 1 +
skins/larry/templates/contactedit.html | 2 +-
program/localization/de_CH/labels.inc | 1 +
skins/larry/ui.js | 2 +-
9 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index cdd93da..c2c2cad 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -272,6 +272,7 @@
$labels['rename'] = 'Umbenennen';
$labels['addphoto'] = 'Hinzufügen';
$labels['replacephoto'] = 'Ersetzen';
+$labels['uploadphoto'] = 'Bild hochladen';
$labels['newcontact'] = 'Neuen Kontakt erfassen';
$labels['deletecontact'] = 'Gewählte Kontakte löschen';
$labels['composeto'] = 'Nachricht verfassen';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index c130f7f..018af1c 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -15,6 +15,7 @@
*/
$messages = array();
+$messages['errortitle'] = 'Fehlermeldung';
$messages['loginfailed'] = 'Login fehlgeschlagen';
$messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies';
$messages['sessionerror'] = 'Ihre Session ist ungültig oder abgelaufen';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index ba5b52c..196d87c 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -272,6 +272,7 @@
$labels['rename'] = 'Umbenennen';
$labels['addphoto'] = 'Kontaktbild hinzufügen';
$labels['replacephoto'] = 'Bild ändern';
+$labels['uploadphoto'] = 'Bild hochladen';
$labels['newcontact'] = 'Neuen Kontakt erstellen';
$labels['deletecontact'] = 'Gewählte Kontakte löschen';
$labels['composeto'] = 'Nachricht verfassen';
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index dc88116..fe9f48e 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -15,6 +15,7 @@
*/
$messages = array();
+$messages['errortitle'] = 'Fehlermeldung';
$messages['loginfailed'] = 'Die Anmeldung ist fehlgeschlagen.';
$messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies.';
$messages['sessionerror'] = 'Ihre Sitzung ist ungültig oder abgelaufen.';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index f9b2d9b..2182074 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -322,6 +322,7 @@
$labels['rename'] = 'Rename';
$labels['addphoto'] = 'Add';
$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
$labels['newcontact'] = 'Create new contact card';
$labels['deletecontact'] = 'Delete selected contacts';
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index f22b1e2..7125c14 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -21,6 +21,7 @@
*/
$messages = array();
+$messages['errortitle'] = 'An error occurred!';
$messages['loginfailed'] = 'Login failed.';
$messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
$messages['sessionerror'] = 'Your session is invalid or expired.';
diff --git a/skins/larry/includes/footer.html b/skins/larry/includes/footer.html
index f884bdf..4a6f8f0 100644
--- a/skins/larry/includes/footer.html
+++ b/skins/larry/includes/footer.html
@@ -3,6 +3,7 @@
// UI startup
var UI = new rcube_mail_ui();
$(document).ready(function(){
+ UI.set('errortitle', '<roundcube:label name="errortitle" />');
UI.init();
});
diff --git a/skins/larry/templates/contactedit.html b/skins/larry/templates/contactedit.html
index 4bea55b..39d4844 100644
--- a/skins/larry/templates/contactedit.html
+++ b/skins/larry/templates/contactedit.html
@@ -41,7 +41,7 @@
<roundcube:button name="cancel" type="input" class="button" label="cancel" onclick="history.back()" condition="env:action=='add'" />
</div>
-<div id="upload-dialog" class="propform popupdialog">
+<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='uploadphoto' />">
<roundcube:object name="photoUploadForm" id="upload-form" size="30" buttons="no" />
<div class="formbuttons">
<roundcube:button command="upload-photo" type="input" class="button mainaction" label="upload" />
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 86c1b0c..759bfab 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -251,7 +251,7 @@
resizable: false,
closeOnEscape: true,
dialogClass: 'popupmessage ' + p.type,
- title: null,
+ title: env.errortitle,
close: function() {
me.messagedialog.dialog('destroy').hide();
},
--
Gitblit v1.9.1