From f535443a1b7a54bbe12baa8fdf0b144d35803fed Mon Sep 17 00:00:00 2001 From: Fritz Zaucker Date: Thu, 15 Feb 2024 16:08:34 +0100 Subject: [PATCH 1/2] Make foreach function calls consistent --- CHANGES | 3 +++ .../source/class/callbackery/ui/Card.js | 21 ++++++++++++------- .../source/class/callbackery/ui/form/Auto.js | 18 ++++++++-------- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/CHANGES b/CHANGES index 4384fd38..10e79620 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ + - Translate tooltip and placeholder in Card.js + - Make foreach function calls consistent in Card.js and Auto.js + 0.48.1 2023-12-01 17:32:03 +0100 Tobias Oetiker - use CB_CFG_ as prefix ... this makes more sense than CM_CB diff --git a/lib/CallBackery/qooxdoo/callbackery/source/class/callbackery/ui/Card.js b/lib/CallBackery/qooxdoo/callbackery/source/class/callbackery/ui/Card.js index 54ca1443..fefaa3a8 100644 --- a/lib/CallBackery/qooxdoo/callbackery/source/class/callbackery/ui/Card.js +++ b/lib/CallBackery/qooxdoo/callbackery/source/class/callbackery/ui/Card.js @@ -26,7 +26,7 @@ qx.Class.define("callbackery.ui.Card", { this.__dataCache = {}; this.__actions = []; - cfg.action.forEach(function(action) { + cfg.action.forEach(action => { if (action.addToContextMenu) { this.__actions.push(action); } @@ -111,7 +111,7 @@ qx.Class.define("callbackery.ui.Card", { this._setLayout(layout); // add form elements - formCfg.forEach(function(cfg) { + formCfg.forEach(cfg => { var labelCfg = cfg.label; var fieldCfg = cfg.field; @@ -124,12 +124,12 @@ qx.Class.define("callbackery.ui.Card", { font : 'cardLabel' }); if (labelCfg.set) { + ['value','tooltip'].forEach(key => { + if (key in labelCfg.set){ + labelCfg.set[key] = this.xtr(labelCfg.set[key]); + } + }); label.set(labelCfg.set); - // canot use set({}) with xtr(). - // TODO: fix xtr() return - if (labelCfg.set.value) { - label.setValue(this.xtr(labelCfg.set.value)); - } } this._add(label, labelCfg.addSet); } @@ -145,6 +145,11 @@ qx.Class.define("callbackery.ui.Card", { var fieldClass = qx.Bootstrap.getByName(className); var field = new fieldClass; if (fieldCfg.set) { + ['placeholder','tooltip'].forEach(key => { + if (key in fieldCfg.set){ + fieldCfg.set[key] = this.xtr(fieldCfg.set[key]); + } + }); field.set(fieldCfg.set); } var event; @@ -216,7 +221,7 @@ qx.Class.define("callbackery.ui.Card", { }, this); // add action buttons - this.__actions.forEach(function(action) { + this.__actions.forEach(action => { var btn = this.__createButton(this.xtr(action.label), action.buttonSet.icon); btn.addListener('execute', function() { this.__parentForm.setSelection(this.__dataCache); diff --git a/lib/CallBackery/qooxdoo/callbackery/source/class/callbackery/ui/form/Auto.js b/lib/CallBackery/qooxdoo/callbackery/source/class/callbackery/ui/form/Auto.js index e8f18c18..2fa45510 100644 --- a/lib/CallBackery/qooxdoo/callbackery/source/class/callbackery/ui/form/Auto.js +++ b/lib/CallBackery/qooxdoo/callbackery/source/class/callbackery/ui/form/Auto.js @@ -59,7 +59,7 @@ qx.Class.define("callbackery.ui.form.Auto", { var tm = this._typeMap = {}; var that = this; var formKeyIdx = 0; - structure.forEach(function(s){ + structure.forEach(s => { var options = {}; // value binding in qooxdoo does not like keys // with strange characters ... (like -) @@ -72,7 +72,7 @@ qx.Class.define("callbackery.ui.form.Auto", { this._keyToFormKey[s.key] = formKey; this._formKeyToKey[formKey] = s.key; } - ['note','copyOnTap','copyFailMsg','copySuccessMsg'].forEach(function(prop){ + ['note','copyOnTap','copyFailMsg','copySuccessMsg'].forEach(prop => { if (s[prop]){ options[prop] = qx.lang.Type.isString(s[prop]) || qx.lang.Type.isArray(s[prop]) ? @@ -167,9 +167,9 @@ qx.Class.define("callbackery.ui.form.Auto", { case 'comboBox': control = new qx.ui.form.ComboBox(); var ctrl = this._boxCtrl[s.key] = new qx.data.controller.List(null, control); - cfg.structure.forEach(function(item){ + cfg.structure.forEach(item => { item = item != null ? this.xtr(item) : null; - },this); + }); var sbModel = qx.data.marshal.Json.createModel(cfg.structure || []); ctrl.setModel(sbModel); break; @@ -203,11 +203,11 @@ qx.Class.define("callbackery.ui.form.Auto", { if (s.set.filter){ s.set.filter = RegExp(s.filter); } - ['placeholder','tooltip','label'].forEach(function(key){ + ['placeholder','tooltip','label'].forEach(key => { if (key in s.set){ s.set[key] = this.xtr(s.set[key]); } - }, this); + }); control.set(s.set); } @@ -263,7 +263,7 @@ qx.Class.define("callbackery.ui.form.Auto", { } }); } - },this); + }); var model = this._model = formCtrl.createModel(true); @@ -364,11 +364,11 @@ qx.Class.define("callbackery.ui.form.Auto", { }]); } else { - data.forEach(function(item,i){ + data.forEach((item,i) => { item.title = item.title != null ? this.xtr(item.title) : null; - },this); + }); model = qx.data.marshal.Json.createModel(data); } let lookup = {}; From f593a76cf04783680c64a9ab1495665b86c4abec Mon Sep 17 00:00:00 2001 From: Fritz Zaucker Date: Tue, 4 Nov 2025 11:57:40 +0100 Subject: [PATCH 2/2] Update and cleanup .po files --- CHANGES | 2 + .../callbackery/source/translation/de.po | 7 +-- .../callbackery/source/translation/en.po | 15 ------ .../callbackery/source/translation/fr.po | 48 ++++++++--------- .../callbackery/source/translation/it.po | 52 ++++++++----------- 5 files changed, 48 insertions(+), 76 deletions(-) diff --git a/CHANGES b/CHANGES index fe12baec..1e1f7c60 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ + - complete fr.po and it.po files + 0.56.5 2025-09-30 17:01:56 +0200 Tobias Oetiker - blank out formData when there is only parentform data in the args diff --git a/lib/CallBackery/qooxdoo/callbackery/source/translation/de.po b/lib/CallBackery/qooxdoo/callbackery/source/translation/de.po index 2c56ac3b..5adcab46 100644 --- a/lib/CallBackery/qooxdoo/callbackery/source/translation/de.po +++ b/lib/CallBackery/qooxdoo/callbackery/source/translation/de.po @@ -41,11 +41,11 @@ msgstr "" #: callbackery/ui/Login.js:143 msgid "Reset Password" -msgstr "" +msgstr "Passwort zurück setzen" #: callbackery/ui/Login.js:149 msgid "Register New Account" -msgstr "" +msgstr "Neues Konto registrieren" #: callbackery/ui/Login.js:163 msgid "release %1, %2 by %3" @@ -139,6 +139,3 @@ msgstr "Daten werden geladen" #: callbackery/ui/plugin/Html.js:54 msgid "Loading HTML Data" msgstr "HTML Daten werde geladen" - -#~ msgid "%1 copied to clipboard." -#~ msgstr "%1 in die Zwischenablage kopiert." diff --git a/lib/CallBackery/qooxdoo/callbackery/source/translation/en.po b/lib/CallBackery/qooxdoo/callbackery/source/translation/en.po index 36a8caa9..dd3c05ff 100644 --- a/lib/CallBackery/qooxdoo/callbackery/source/translation/en.po +++ b/lib/CallBackery/qooxdoo/callbackery/source/translation/en.po @@ -135,18 +135,3 @@ msgstr "" #: callbackery/ui/plugin/Html.js:54 msgid "Loading HTML Data" msgstr "" - -#~ msgid "%1 copied to clipboard." -#~ msgstr "" - -#~ msgid "Implemented by %1." -#~ msgstr "" - -#~ msgid "Passwort" -#~ msgstr "" - -#~ msgid "Username" -#~ msgstr "" - -#~ msgid "Version %1, %2%3%4" -#~ msgstr "" diff --git a/lib/CallBackery/qooxdoo/callbackery/source/translation/fr.po b/lib/CallBackery/qooxdoo/callbackery/source/translation/fr.po index ed2c4690..6f3a16a6 100644 --- a/lib/CallBackery/qooxdoo/callbackery/source/translation/fr.po +++ b/lib/CallBackery/qooxdoo/callbackery/source/translation/fr.po @@ -13,11 +13,11 @@ msgstr "" #: callbackery/ui/Footer.js:23 msgid "Support" -msgstr "" +msgstr "Soutien" #: callbackery/ui/Footer.js:34 msgid "Implemented by %1" -msgstr "" +msgstr "Mis en œuvre par" #: callbackery/ui/Footer.js:39 msgid "Version %1, %2%3" @@ -25,31 +25,31 @@ msgstr "" #: callbackery/ui/Login.js:23 callbackery/ui/Login.js:111 msgid "Login" -msgstr "" +msgstr "Se connecter" #: callbackery/ui/Login.js:82 msgid "User" -msgstr "" +msgstr "Utilisateur" #: callbackery/ui/Login.js:98 msgid "Password" -msgstr "" +msgstr "Mot de passe" #: callbackery/ui/MsgBox.js:68 callbackery/ui/Login.js:114 msgid "OK" -msgstr "" +msgstr "D'ACCORD" #: callbackery/ui/Login.js:143 msgid "Reset Password" -msgstr "" +msgstr "Réinitialiser le mot de passe" #: callbackery/ui/Login.js:149 msgid "Register New Account" -msgstr "" +msgstr "Créer un nouveau compte" #: callbackery/ui/Login.js:163 msgid "release %1, %2 by %3" -msgstr "" +msgstr "publié %1, $2 par %3" #: callbackery/ui/Login.js:284 msgid "%1" @@ -61,7 +61,7 @@ msgstr "Annuler" #: callbackery/ui/MsgBox.js:67 msgid "Apply" -msgstr "" +msgstr "Appliquer" #: callbackery/ui/MsgBox.js:69 msgid "Yes" @@ -73,11 +73,11 @@ msgstr "No" #: callbackery/ui/MsgBox.js:177 msgid "RPC Error %1" -msgstr "" +msgstr "Erreur RPC %1" #: callbackery/ui/TabView.js:46 msgid "Unsaved Data" -msgstr "" +msgstr "Données non enregistrées" #: callbackery/ui/TabView.js:47 msgid "This form contains unsaved data. Do you still want to switch?" @@ -92,21 +92,21 @@ msgstr "" #: callbackery/ui/form/renderer/NoteForm.js:82 #: callbackery/ui/form/renderer/NoteForm.js:84 msgid "Select %1 and press [ctrl]+[c]" -msgstr "" +msgstr "Sélectionnez %1 et appuyez sur [ctrl]+[c]" #: callbackery/ui/form/renderer/NoteForm.js:90 msgid "Success" -msgstr "" +msgstr "Succès" #: callbackery/ui/form/renderer/NoteForm.js:93 #: callbackery/ui/form/renderer/NoteForm.js:96 msgid "Copy failed" -msgstr "" +msgstr "Échec de la copie" #: callbackery/ui/plugin/Action.js:133 callbackery/ui/plugin/Action.js:164 #: callbackery/ui/plugin/Action.js:272 msgid "Validation Error" -msgstr "" +msgstr "Erreur de validation" #: callbackery/ui/plugin/Action.js:134 callbackery/ui/plugin/Action.js:165 #: callbackery/ui/plugin/Action.js:273 @@ -116,26 +116,20 @@ msgstr "" #: callbackery/ui/plugin/Action.js:179 msgid "No Data" -msgstr "" +msgstr "Aucune donnée" #: callbackery/ui/plugin/Action.js:188 msgid "Download Exception" -msgstr "" +msgstr "Exception de téléchargement" #: callbackery/ui/plugin/Action.js:305 msgid "Upload Exception" -msgstr "" +msgstr "Exception de téléchargement" #: callbackery/ui/plugin/Form.js:252 msgid "Loading Form Data" -msgstr "" +msgstr "Chargement des données du formulaire" #: callbackery/ui/plugin/Html.js:54 msgid "Loading HTML Data" -msgstr "" - -#~ msgid "%1 copied to clipboard." -#~ msgstr "" - -#~ msgid "Select %1 and press [ctr]+[c]" -#~ msgstr "" +msgstr "Chargement des données HTML" diff --git a/lib/CallBackery/qooxdoo/callbackery/source/translation/it.po b/lib/CallBackery/qooxdoo/callbackery/source/translation/it.po index 4e505574..6b36f456 100644 --- a/lib/CallBackery/qooxdoo/callbackery/source/translation/it.po +++ b/lib/CallBackery/qooxdoo/callbackery/source/translation/it.po @@ -13,15 +13,15 @@ msgstr "" #: callbackery/ui/Footer.js:23 msgid "Support" -msgstr "" +msgstr "Supporto" #: callbackery/ui/Footer.js:34 msgid "Implemented by %1" -msgstr "" +msgstr "Implementato da" #: callbackery/ui/Footer.js:39 msgid "Version %1, %2%3" -msgstr "" +msgstr "Versione %1, %2%3" #: callbackery/ui/Login.js:23 callbackery/ui/Login.js:111 msgid "Login" @@ -29,7 +29,7 @@ msgstr "" #: callbackery/ui/Login.js:82 msgid "User" -msgstr "" +msgstr "Utente" #: callbackery/ui/Login.js:98 msgid "Password" @@ -41,15 +41,15 @@ msgstr "" #: callbackery/ui/Login.js:143 msgid "Reset Password" -msgstr "" +msgstr "Reimposta password" #: callbackery/ui/Login.js:149 msgid "Register New Account" -msgstr "" +msgstr "Registra un nuovo account" #: callbackery/ui/Login.js:163 msgid "release %1, %2 by %3" -msgstr "" +msgstr "pubblicazione %1, %2 da %3" #: callbackery/ui/Login.js:284 msgid "%1" @@ -57,31 +57,31 @@ msgstr "" #: callbackery/ui/Popup.js:39 callbackery/ui/MsgBox.js:66 msgid "Cancel" -msgstr "" +msgstr "Cancellare" #: callbackery/ui/MsgBox.js:67 msgid "Apply" -msgstr "" +msgstr "Fare domanda a" #: callbackery/ui/MsgBox.js:69 msgid "Yes" -msgstr "" +msgstr "SÌ" #: callbackery/ui/MsgBox.js:70 msgid "No" -msgstr "" +msgstr "NO" #: callbackery/ui/MsgBox.js:177 msgid "RPC Error %1" -msgstr "" +msgstr "Errore RPC %1" #: callbackery/ui/TabView.js:46 msgid "Unsaved Data" -msgstr "" +msgstr "Dati non salvati" #: callbackery/ui/TabView.js:47 msgid "This form contains unsaved data. Do you still want to switch?" -msgstr "" +msgstr "Questo modulo contiene dati non salvati. Vuoi comunque cambiare?" #: callbackery/ui/form/Auto.js:78 callbackery/ui/form/Auto.js:86 msgid "dd.MM.yyyy" @@ -90,16 +90,16 @@ msgstr "" #: callbackery/ui/form/renderer/NoteForm.js:82 #: callbackery/ui/form/renderer/NoteForm.js:84 msgid "Select %1 and press [ctrl]+[c]" -msgstr "" +msgstr "Seleziona %1 e premi [ctrl]+[c]" #: callbackery/ui/form/renderer/NoteForm.js:90 msgid "Success" -msgstr "" +msgstr "Successo" #: callbackery/ui/form/renderer/NoteForm.js:93 #: callbackery/ui/form/renderer/NoteForm.js:96 msgid "Copy failed" -msgstr "" +msgstr "Copia non riuscita" #: callbackery/ui/plugin/Action.js:133 callbackery/ui/plugin/Action.js:164 #: callbackery/ui/plugin/Action.js:272 @@ -110,30 +110,24 @@ msgstr "" #: callbackery/ui/plugin/Action.js:273 msgid "" "The form can only be submitted when all data fields have valid content." -msgstr "" +msgstr "Il modulo può essere inviato solo se tutti i campi dati hanno un contenuto valido." #: callbackery/ui/plugin/Action.js:179 msgid "No Data" -msgstr "" +msgstr "Nessun dato" #: callbackery/ui/plugin/Action.js:188 msgid "Download Exception" -msgstr "" +msgstr "Scarica eccezione" #: callbackery/ui/plugin/Action.js:305 msgid "Upload Exception" -msgstr "" +msgstr "Eccezione di caricamento" #: callbackery/ui/plugin/Form.js:252 msgid "Loading Form Data" -msgstr "" +msgstr "Caricamento dei dati del modulo" #: callbackery/ui/plugin/Html.js:54 msgid "Loading HTML Data" -msgstr "" - -#~ msgid "%1 copied to clipboard." -#~ msgstr "" - -#~ msgid "Select %1 and press [ctr]+[c]" -#~ msgstr "" +msgstr "Caricamento dati HTML"