From 43d43bdcd6e742667bc3626657bafe45f76132a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 3 Sep 2021 13:47:22 +0100
Subject: [PATCH 1/3] Clean up translations for required questions

---
 temp.md           |  0
 www/form/inner.js | 11 ++++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 temp.md

diff --git a/temp.md b/temp.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/www/form/inner.js b/www/form/inner.js
index c30bc99d1..fdbe2bc54 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2932,10 +2932,14 @@ define([
                 return;
             }
 
-            Messages.form_required = "Required"; // XXX
+            // XXX
+            Messages.form_required_answer = "Answer: ";
+            Messages.form_required_on = "Required";
+            Messages.form_required_off = "Optional";
+
             var requiredTag;
             if (block.opts && block.opts.required) {
-                requiredTag = h('span.cp-form-required-tag', Messages.form_required);
+                requiredTag = h('span.cp-form-required-tag', Messages.form_required_on);
             }
 
             var dragHandle;
@@ -2954,9 +2958,6 @@ define([
             Messages.form_preview = "Preview:"; // XXX
             var previewDiv = h('div.cp-form-preview', Messages.form_preview);
 
-            Messages.form_required_answer = "Answer: ";
-            Messages.form_required_on = "required";
-            Messages.form_required_off = "optional";
             // Required radio displayed only for types that have an "isEmpty" function
             var requiredDiv, conditionalDiv;
             if (APP.isEditor && !isStatic && data.isEmpty) {

From a82481c36da62de40dc44db3e0934dbb0a7cee6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 3 Sep 2021 20:26:18 +0100
Subject: [PATCH 2/3] Remove background from form result table for grid
 questions

---
 www/form/app-form.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index acf9051dd..2673685a2 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -720,6 +720,7 @@
                     font-weight: bold;
                     padding: 5px 10px;
                     .cp-form-results-cell();
+                    background: transparent;
                 }
                 &:not(:first-child) {
                     .cp-mr-q {

From 68c4232eb3d9a4bf38af447ec75714004d40b3cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 3 Sep 2021 20:26:44 +0100
Subject: [PATCH 3/3] Changes related to translation strings

---
 www/common/common-ui-elements.js | 3 ++-
 www/common/inner/share.js        | 6 +++---
 www/form/templates.js            | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index ac24b1ab9..662e39fc3 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -527,6 +527,7 @@ define([
         var sframeChan = common.getSframeChannel();
         var appType = (common.getMetadataMgr().getMetadata().type || 'pad').toUpperCase();
         data = data || {};
+        Messages.toolbar_preview = "Preview"; // XXX
         switch (type) {
             case 'export':
                 button = $('<button>', {
@@ -753,7 +754,7 @@ define([
                     //title: Messages.previewButtonTitle, // TODO display if the label text is collapsed
                 }, [
                     h('i.fa.fa-eye'),
-                    h('span.cp-toolbar-name', Messages.share_linkOpen)
+                    h('span.cp-toolbar-name', Messages.toolbar_preview)
                 ])).click(common.prepareFeedback(type));
                 break;
             case 'print':
diff --git a/www/common/inner/share.js b/www/common/inner/share.js
index 4bcf0d621..f76c15e28 100644
--- a/www/common/inner/share.js
+++ b/www/common/inner/share.js
@@ -420,12 +420,12 @@ define([
                 embed: Util.isChecked($link.find('#cp-share-embed'))
             }));
         });
-
+        Messages.share_linkOpen = "Open link"; // XXX
         var linkButtons = [
             makeCancelButton(),
             !opts.sharedFolder && {
                 className: 'secondary cp-nobar',
-                name: Messages.share_linkOpen,
+                name: Messages.share_linkOpen, // XXX add fa-eye icon
                 onClick: function () {
                     opts.saveValue();
                     var v = opts.getLinkValue({
@@ -441,7 +441,7 @@ define([
                 keys: [[13, 'ctrl']]
             }, {
                 className: 'primary cp-nobar',
-                name: Messages.share_linkCopy,
+                name: Messages.share_linkCopy, // XXX add fa-link icon
                 onClick: function () {
                     opts.saveValue();
                     var v = opts.getLinkValue({
diff --git a/www/form/templates.js b/www/form/templates.js
index d72c7ecb8..c4eb93912 100644
--- a/www/form/templates.js
+++ b/www/form/templates.js
@@ -1,7 +1,7 @@
 define([
     '/customize/messages.js'
 ], function (Messages) {
-    Messages.form_type_poll = "Quick poll"; // XXX update key
+    Messages.form_template_poll = "Quick poll"; // XXX update key
     var pollValues = [];
     var d8 = new Date();
     d8.setDate(d8.getDate() - d8.getDay() + 7); // set sunday
@@ -24,7 +24,7 @@ define([
     return [{
         id: 'a',
         used: 1,
-        name: Messages.form_type_poll,
+        name: Messages.form_template_poll,
         content: {
             answers: {
                 anonymous: true,