From 75552b7bb35e6358226532b4ea90b1b23e27aaba Mon Sep 17 00:00:00 2001
From: Markus Weiland <mw@graph-ix.net>
Date: Tue, 28 May 2019 01:12:02 +0200
Subject: [PATCH 1/2] #280 Bad UI layout and label in Calendar clone window

* Fix label alignment.
* Improve calendar name label text.
* Improve variable declarations.
* Fix missing semicolon.
* Improve comparison operator.
---
 common/content/exchangeCloneSettings.js       | 11 +++++------
 common/content/exchangeCloneSettings.xul      | 18 ++++++++++++++----
 common/locale/cs_CZ/exchangeCloneSettings.dtd |  4 +---
 common/locale/de/exchangeCloneSettings.dtd    |  4 +---
 common/locale/en/exchangeCloneSettings.dtd    |  4 +---
 common/locale/en_US/exchangeCloneSettings.dtd |  4 +---
 common/locale/es_ES/exchangeCloneSettings.dtd |  4 +---
 common/locale/fr_FR/exchangeCloneSettings.dtd |  4 +---
 common/locale/gl/exchangeCloneSettings.dtd    |  4 +---
 common/locale/hu/exchangeCloneSettings.dtd    |  4 +---
 common/locale/it_IT/exchangeCloneSettings.dtd |  4 +---
 common/locale/ja_JP/exchangeCloneSettings.dtd |  4 +---
 common/locale/nl/exchangeCloneSettings.dtd    |  4 +---
 common/locale/pl/exchangeCloneSettings.dtd    |  4 +---
 common/locale/pt_BR/exchangeCloneSettings.dtd |  4 +---
 common/locale/ro/exchangeCloneSettings.dtd    |  4 +---
 common/locale/ru/exchangeCloneSettings.dtd    |  4 +---
 common/locale/sk/exchangeCloneSettings.dtd    |  4 +---
 common/locale/sv/exchangeCloneSettings.dtd    |  4 +---
 common/locale/tr/exchangeCloneSettings.dtd    |  4 +---
 20 files changed, 37 insertions(+), 64 deletions(-)

diff --git a/common/content/exchangeCloneSettings.js b/common/content/exchangeCloneSettings.js
index 6a5d0f0a..828be125 100644
--- a/common/content/exchangeCloneSettings.js
+++ b/common/content/exchangeCloneSettings.js
@@ -40,7 +40,7 @@ exchExchangeCloneSettings.prototype = {
         if (vbox) {
             let eList = vbox.getElementsByAttribute('required', 'true');
             for (let i = 0; i < eList.length && canAdvance; ++i) {
-                canAdvance = (eList[i].value != "");
+                canAdvance = (eList[i].value !== "");
             }
 
             if (canAdvance) {
@@ -60,16 +60,16 @@ exchExchangeCloneSettings.prototype = {
     },
 
     onSave: function _onSave() {
-        var oldCalId = this._window.arguments[0].calendar.id;
+        let oldCalId = this._window.arguments[0].calendar.id;
 
         // Clone the Calendar settings to a new cal id.
-        var newCalId = this.globalFunctions.copyCalendarSettings(oldCalId);
+        let newCalId = this.globalFunctions.copyCalendarSettings(oldCalId);
 
         // Save settings in dialog to new cal id.
         tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(newCalId);
 
         // Save the description/name for the calendar and create a new unique uri.
-        var toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+        let toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
             .getService(Ci.nsIPrefService)
             .getBranch("calendar.registry." + newCalId + ".");
 
@@ -85,7 +85,6 @@ exchExchangeCloneSettings.prototype = {
             .getService(Ci.nsIPrefService).savePrefFile(null);
         return true;
     },
-
-}
+};
 
 var tmpExchangeCloneSettings = new exchExchangeCloneSettings(document, window);
diff --git a/common/content/exchangeCloneSettings.xul b/common/content/exchangeCloneSettings.xul
index 665e05bb..d77a0504 100644
--- a/common/content/exchangeCloneSettings.xul
+++ b/common/content/exchangeCloneSettings.xul
@@ -39,10 +39,20 @@
         onload="tmpExchangeCloneSettings.onLoad();">
     <script type="application/javascript"
             src="chrome://exchangecommon/content/exchangeCloneSettings.js" />
-    <hbox>
-        <label value="&label.ecExchangeSettings.title;" />
-        <textbox id="exchWebService_clone_description" />
-    </hbox>
+    <grid flex="1">
+        <columns>
+            <column />
+            <column flex="1" />
+        </columns>
+        <rows>
+            <row align="center">
+                <label value="&label.ecExchangeSettings.title;" />
+                <vbox>
+                    <textbox id="exchWebService_clone_description" />
+                </vbox>
+            </row>
+        </rows>
+    </grid>
     <vbox id="exchWebService-exchange-settings"
           flex="1"></vbox>
 </dialog>
diff --git a/common/locale/cs_CZ/exchangeCloneSettings.dtd b/common/locale/cs_CZ/exchangeCloneSettings.dtd
index 3863f296..a00560ec 100644
--- a/common/locale/cs_CZ/exchangeCloneSettings.dtd
+++ b/common/locale/cs_CZ/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Uložit">
 <!ENTITY label.cancelbutton "Storno">
 
-<!ENTITY label.ecExchangeSettings.title "Nový popis:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/de/exchangeCloneSettings.dtd b/common/locale/de/exchangeCloneSettings.dtd
index e0ed043e..74e6b4b7 100644
--- a/common/locale/de/exchangeCloneSettings.dtd
+++ b/common/locale/de/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Speichern">
 <!ENTITY label.cancelbutton "Abbrechen">
 
-<!ENTITY label.ecExchangeSettings.title "Neue Beschreibung:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Kalendername:">
diff --git a/common/locale/en/exchangeCloneSettings.dtd b/common/locale/en/exchangeCloneSettings.dtd
index 01f7f685..2b8ef8e9 100644
--- a/common/locale/en/exchangeCloneSettings.dtd
+++ b/common/locale/en/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Save">
 <!ENTITY label.cancelbutton "Cancel">
 
-<!ENTITY label.ecExchangeSettings.title "New description:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/en_US/exchangeCloneSettings.dtd b/common/locale/en_US/exchangeCloneSettings.dtd
index 01f7f685..2b8ef8e9 100644
--- a/common/locale/en_US/exchangeCloneSettings.dtd
+++ b/common/locale/en_US/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Save">
 <!ENTITY label.cancelbutton "Cancel">
 
-<!ENTITY label.ecExchangeSettings.title "New description:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/es_ES/exchangeCloneSettings.dtd b/common/locale/es_ES/exchangeCloneSettings.dtd
index 654ae121..c2858391 100644
--- a/common/locale/es_ES/exchangeCloneSettings.dtd
+++ b/common/locale/es_ES/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Guardar">
 <!ENTITY label.cancelbutton "Cancelar">
 
-<!ENTITY label.ecExchangeSettings.title "Nueva descripción:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/fr_FR/exchangeCloneSettings.dtd b/common/locale/fr_FR/exchangeCloneSettings.dtd
index ffca50d4..5b4f3e2a 100644
--- a/common/locale/fr_FR/exchangeCloneSettings.dtd
+++ b/common/locale/fr_FR/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Sauvegarder">
 <!ENTITY label.cancelbutton "Annuler">
 
-<!ENTITY label.ecExchangeSettings.title "Nouvelle description :">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/gl/exchangeCloneSettings.dtd b/common/locale/gl/exchangeCloneSettings.dtd
index 7d6c330e..53388fcd 100644
--- a/common/locale/gl/exchangeCloneSettings.dtd
+++ b/common/locale/gl/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Gardar">
 <!ENTITY label.cancelbutton "Cancelar">
 
-<!ENTITY label.ecExchangeSettings.title "Nova descrición:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/hu/exchangeCloneSettings.dtd b/common/locale/hu/exchangeCloneSettings.dtd
index f47db502..17682f7e 100644
--- a/common/locale/hu/exchangeCloneSettings.dtd
+++ b/common/locale/hu/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Mentés">
 <!ENTITY label.cancelbutton "Mégse">
 
-<!ENTITY label.ecExchangeSettings.title "Új leírás:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/it_IT/exchangeCloneSettings.dtd b/common/locale/it_IT/exchangeCloneSettings.dtd
index c8ccf764..09f1f691 100644
--- a/common/locale/it_IT/exchangeCloneSettings.dtd
+++ b/common/locale/it_IT/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Salva">
 <!ENTITY label.cancelbutton "Annulla">
 
-<!ENTITY label.ecExchangeSettings.title "Nuova descrizione:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/ja_JP/exchangeCloneSettings.dtd b/common/locale/ja_JP/exchangeCloneSettings.dtd
index 01f7f685..2b8ef8e9 100644
--- a/common/locale/ja_JP/exchangeCloneSettings.dtd
+++ b/common/locale/ja_JP/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Save">
 <!ENTITY label.cancelbutton "Cancel">
 
-<!ENTITY label.ecExchangeSettings.title "New description:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/nl/exchangeCloneSettings.dtd b/common/locale/nl/exchangeCloneSettings.dtd
index bdf1e756..3cd2f960 100644
--- a/common/locale/nl/exchangeCloneSettings.dtd
+++ b/common/locale/nl/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Opslaan">
 <!ENTITY label.cancelbutton "Annuleren">
 
-<!ENTITY label.ecExchangeSettings.title "Nieuwe omschrijving:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/pl/exchangeCloneSettings.dtd b/common/locale/pl/exchangeCloneSettings.dtd
index 01f7f685..2b8ef8e9 100644
--- a/common/locale/pl/exchangeCloneSettings.dtd
+++ b/common/locale/pl/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Save">
 <!ENTITY label.cancelbutton "Cancel">
 
-<!ENTITY label.ecExchangeSettings.title "New description:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/pt_BR/exchangeCloneSettings.dtd b/common/locale/pt_BR/exchangeCloneSettings.dtd
index 01f7f685..2b8ef8e9 100644
--- a/common/locale/pt_BR/exchangeCloneSettings.dtd
+++ b/common/locale/pt_BR/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Save">
 <!ENTITY label.cancelbutton "Cancel">
 
-<!ENTITY label.ecExchangeSettings.title "New description:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/ro/exchangeCloneSettings.dtd b/common/locale/ro/exchangeCloneSettings.dtd
index 01f7f685..2b8ef8e9 100644
--- a/common/locale/ro/exchangeCloneSettings.dtd
+++ b/common/locale/ro/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Save">
 <!ENTITY label.cancelbutton "Cancel">
 
-<!ENTITY label.ecExchangeSettings.title "New description:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/ru/exchangeCloneSettings.dtd b/common/locale/ru/exchangeCloneSettings.dtd
index cf9b66ba..d46d5e7b 100644
--- a/common/locale/ru/exchangeCloneSettings.dtd
+++ b/common/locale/ru/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Сохранить">
 <!ENTITY label.cancelbutton "Отмена">
 
-<!ENTITY label.ecExchangeSettings.title "Новое описание:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/sk/exchangeCloneSettings.dtd b/common/locale/sk/exchangeCloneSettings.dtd
index 9483e3a4..0699bfbc 100644
--- a/common/locale/sk/exchangeCloneSettings.dtd
+++ b/common/locale/sk/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Uložiť">
 <!ENTITY label.cancelbutton "Zrušiť">
 
-<!ENTITY label.ecExchangeSettings.title "Nový popis:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/sv/exchangeCloneSettings.dtd b/common/locale/sv/exchangeCloneSettings.dtd
index 3516c058..828a9297 100644
--- a/common/locale/sv/exchangeCloneSettings.dtd
+++ b/common/locale/sv/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Spara">
 <!ENTITY label.cancelbutton "Avbryt">
 
-<!ENTITY label.ecExchangeSettings.title "Ny beskrivning:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">
diff --git a/common/locale/tr/exchangeCloneSettings.dtd b/common/locale/tr/exchangeCloneSettings.dtd
index 737ddb31..c9de8c1f 100644
--- a/common/locale/tr/exchangeCloneSettings.dtd
+++ b/common/locale/tr/exchangeCloneSettings.dtd
@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Kaydet">
 <!ENTITY label.cancelbutton "İptal Et">
 
-<!ENTITY label.ecExchangeSettings.title "Yeni tarif:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">

From cc8f1047b4ec7a7143b4b338d21647a5737dd966 Mon Sep 17 00:00:00 2001
From: Markus Weiland <mw@graph-ix.net>
Date: Sun, 1 Sep 2019 14:08:23 +0200
Subject: [PATCH 2/2] #280 Bad UI layout and label in Calendar clone window

* Integrate translations.
---
 common/locale/cs_CZ/exchangeCloneSettings.dtd | 2 +-
 common/locale/es_ES/exchangeCloneSettings.dtd | 2 +-
 common/locale/gl/exchangeCloneSettings.dtd    | 2 +-
 common/locale/hu/exchangeCloneSettings.dtd    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/locale/cs_CZ/exchangeCloneSettings.dtd b/common/locale/cs_CZ/exchangeCloneSettings.dtd
index a00560ec..1f066eb3 100644
--- a/common/locale/cs_CZ/exchangeCloneSettings.dtd
+++ b/common/locale/cs_CZ/exchangeCloneSettings.dtd
@@ -1,4 +1,4 @@
 <!ENTITY label.acceptbutton "Uložit">
 <!ENTITY label.cancelbutton "Storno">
 
-<!ENTITY label.ecExchangeSettings.title "Calendar name:">
+<!ENTITY label.ecExchangeSettings.title "Název kalendáře:">
diff --git a/common/locale/es_ES/exchangeCloneSettings.dtd b/common/locale/es_ES/exchangeCloneSettings.dtd
index c2858391..4a30f445 100644
--- a/common/locale/es_ES/exchangeCloneSettings.dtd
+++ b/common/locale/es_ES/exchangeCloneSettings.dtd
@@ -1,4 +1,4 @@
 <!ENTITY label.acceptbutton "Guardar">
 <!ENTITY label.cancelbutton "Cancelar">
 
-<!ENTITY label.ecExchangeSettings.title "Calendar name:">
+<!ENTITY label.ecExchangeSettings.title "Nombre del calendario:">
diff --git a/common/locale/gl/exchangeCloneSettings.dtd b/common/locale/gl/exchangeCloneSettings.dtd
index 53388fcd..ed9d6419 100644
--- a/common/locale/gl/exchangeCloneSettings.dtd
+++ b/common/locale/gl/exchangeCloneSettings.dtd
@@ -1,4 +1,4 @@
 <!ENTITY label.acceptbutton "Gardar">
 <!ENTITY label.cancelbutton "Cancelar">
 
-<!ENTITY label.ecExchangeSettings.title "Calendar name:">
+<!ENTITY label.ecExchangeSettings.title "Nome do calendario:">
diff --git a/common/locale/hu/exchangeCloneSettings.dtd b/common/locale/hu/exchangeCloneSettings.dtd
index 17682f7e..937a4f6c 100644
--- a/common/locale/hu/exchangeCloneSettings.dtd
+++ b/common/locale/hu/exchangeCloneSettings.dtd
@@ -1,4 +1,4 @@
 <!ENTITY label.acceptbutton "Mentés">
 <!ENTITY label.cancelbutton "Mégse">
 
-<!ENTITY label.ecExchangeSettings.title "Calendar name:">
+<!ENTITY label.ecExchangeSettings.title "Naptár neve:">