PHRAS-3884 translation and advanced search field name (#4348)

* translation and advanced search field name * fix date field label , add string
alchemy-fr · Jul 26, 2023 · 5fbf379 · 5fbf379
1 parent 8422eb5
commit 5fbf379
Show file tree

Hide file tree

Showing 28 changed files with 543 additions and 409 deletions.
diff --git a/Phraseanet-production-client/config/config.js b/Phraseanet-production-client/config/config.js
@@ -13,5 +13,5 @@ module.exports = {
     setupDir: _root + 'tests/setup/node.js',
     karmaConf: _root + 'config/karma.conf.js',
     // change this version when you change JS file for lazy loading
-    assetFileVersion: 90
+    assetFileVersion: 91
 };
diff --git a/Phraseanet-production-client/dist/authenticate.js b/Phraseanet-production-client/dist/authenticate.js
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=90";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=91";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

diff --git a/Phraseanet-production-client/dist/authenticate.min.js b/Phraseanet-production-client/dist/authenticate.min.js
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=90";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=91";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

diff --git a/Phraseanet-production-client/dist/commons.js b/Phraseanet-production-client/dist/commons.js
@@ -91,7 +91,7 @@
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=90";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=91";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

diff --git a/Phraseanet-production-client/dist/commons.min.js b/Phraseanet-production-client/dist/commons.min.js
@@ -91,7 +91,7 @@
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=90";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=91";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

diff --git a/Phraseanet-production-client/dist/production.js b/Phraseanet-production-client/dist/production.js
@@ -3968,7 +3968,7 @@ var workzoneFacets = function workzoneFacets(services) {
                             (0, _jquery2.default)(el).hide();
                         }
                     });
-                    ul.append('<button class="see_more_btn">See more</button>');
+                    ul.append('<button class="see_more_btn">' + localeService.t('seeMore') + '</button>');
                 }
             });
             (0, _jquery2.default)('.see_more_btn').on('click', function () {
@@ -65046,6 +65046,12 @@ var preferences = function preferences(services) {
             appEvents.emit('search.doRefreshState');
         });
 
+        $container.on('change', '.preferences-see-real-field-name', function (event) {
+            var $el = (0, _jquery2.default)(event.currentTarget);
+            event.preventDefault();
+            appCommons.userModule.setPref('see_real_field_name', $el.prop('checked') ? '1' : '0');
+        });
+
         $container.on('change', '.preferences-options-basket-status', function (event) {
             var $el = (0, _jquery2.default)(event.currentTarget);
             event.preventDefault();
@@ -69672,6 +69678,15 @@ var searchAdvancedForm = function searchAdvancedForm(services) {
         checkFilters(true);
     });
 
+    (0, _jquery2.default)('#ADVSRCH_FIELDS_ZONE input.see-real-field-name').change(function () {
+        if ((0, _jquery2.default)(this).prop('checked') === true) {
+            (0, _jquery2.default)(this).data('real-field', 'field_with_real_name');
+        } else {
+            (0, _jquery2.default)(this).data('real-field', 'field_without_real_name');
+        }
+        checkFilters(true);
+    });
+
     var checkFilters = function checkFilters(save) {
         var danger = false;
         var search = {
@@ -69788,13 +69803,15 @@ var searchAdvancedForm = function searchAdvancedForm(services) {
                 // at least one coll checked for this databox
                 // show again the relevant fields in "sort by" select
                 (0, _jquery2.default)('.db_' + sbas_id, fieldsSort).show().prop('disabled', false);
+
+                var realFieldClass = (0, _jquery2.default)('input.preferences-see-real-field-name').data('real-field');
                 // show again the relevant fields in "from fields" select
                 (0, _jquery2.default)('.db_' + sbas_id, fieldsSelect).show().prop('disabled', false);
-                (0, _jquery2.default)('.db_' + sbas_id, fieldsSelectFake).show().prop('disabled', false);
+                (0, _jquery2.default)('.db_' + sbas_id + '.' + realFieldClass, fieldsSelectFake).show().prop('disabled', false);
                 // show the sb
                 (0, _jquery2.default)('#ADVSRCH_SB_ZONE_' + sbas_id, container).show();
                 // show again the relevant fields in "date field" select
-                (0, _jquery2.default)('.db_' + sbas_id, dateFilterSelect).show().prop('disabled', false);
+                (0, _jquery2.default)('.db_' + sbas_id + '.' + realFieldClass, dateFilterSelect).show().prop('disabled', false);
             }
         });
 

diff --git a/Phraseanet-production-client/dist/production.min.js b/Phraseanet-production-client/dist/production.min.js
@@ -3968,7 +3968,7 @@ var workzoneFacets = function workzoneFacets(services) {
                             (0, _jquery2.default)(el).hide();
                         }
                     });
-                    ul.append('<button class="see_more_btn">See more</button>');
+                    ul.append('<button class="see_more_btn">' + localeService.t('seeMore') + '</button>');
                 }
             });
             (0, _jquery2.default)('.see_more_btn').on('click', function () {
@@ -65046,6 +65046,12 @@ var preferences = function preferences(services) {
             appEvents.emit('search.doRefreshState');
         });
 
+        $container.on('change', '.preferences-see-real-field-name', function (event) {
+            var $el = (0, _jquery2.default)(event.currentTarget);
+            event.preventDefault();
+            appCommons.userModule.setPref('see_real_field_name', $el.prop('checked') ? '1' : '0');
+        });
+
         $container.on('change', '.preferences-options-basket-status', function (event) {
             var $el = (0, _jquery2.default)(event.currentTarget);
             event.preventDefault();
@@ -69672,6 +69678,15 @@ var searchAdvancedForm = function searchAdvancedForm(services) {
         checkFilters(true);
     });
 
+    (0, _jquery2.default)('#ADVSRCH_FIELDS_ZONE input.see-real-field-name').change(function () {
+        if ((0, _jquery2.default)(this).prop('checked') === true) {
+            (0, _jquery2.default)(this).data('real-field', 'field_with_real_name');
+        } else {
+            (0, _jquery2.default)(this).data('real-field', 'field_without_real_name');
+        }
+        checkFilters(true);
+    });
+
     var checkFilters = function checkFilters(save) {
         var danger = false;
         var search = {
@@ -69788,13 +69803,15 @@ var searchAdvancedForm = function searchAdvancedForm(services) {
                 // at least one coll checked for this databox
                 // show again the relevant fields in "sort by" select
                 (0, _jquery2.default)('.db_' + sbas_id, fieldsSort).show().prop('disabled', false);
+
+                var realFieldClass = (0, _jquery2.default)('input.preferences-see-real-field-name').data('real-field');
                 // show again the relevant fields in "from fields" select
                 (0, _jquery2.default)('.db_' + sbas_id, fieldsSelect).show().prop('disabled', false);
-                (0, _jquery2.default)('.db_' + sbas_id, fieldsSelectFake).show().prop('disabled', false);
+                (0, _jquery2.default)('.db_' + sbas_id + '.' + realFieldClass, fieldsSelectFake).show().prop('disabled', false);
                 // show the sb
                 (0, _jquery2.default)('#ADVSRCH_SB_ZONE_' + sbas_id, container).show();
                 // show again the relevant fields in "date field" select
-                (0, _jquery2.default)('.db_' + sbas_id, dateFilterSelect).show().prop('disabled', false);
+                (0, _jquery2.default)('.db_' + sbas_id + '.' + realFieldClass, dateFilterSelect).show().prop('disabled', false);
             }
         });
 

diff --git a/Phraseanet-production-client/dist/skin-000000.css b/Phraseanet-production-client/dist/skin-000000.css
@@ -11233,7 +11233,6 @@ TABLE.explain3 TR TD {
 }
 
 .advanced_search_dialog_container.ui-dialog .add_new_term {
-  width: 54px;
   height: 20px;
   font-size: 12px;
   color: #979797;

diff --git a/Phraseanet-production-client/dist/skin-000000.min.css b/Phraseanet-production-client/dist/skin-000000.min.css
diff --git a/Phraseanet-production-client/dist/skin-959595.css b/Phraseanet-production-client/dist/skin-959595.css
@@ -11248,7 +11248,6 @@ TABLE.explain3 TR TD {
 }
 
 .advanced_search_dialog_container.ui-dialog .add_new_term {
-  width: 54px;
   height: 20px;
   font-size: 12px;
   color: #979797;

diff --git a/Phraseanet-production-client/dist/skin-959595.min.css b/Phraseanet-production-client/dist/skin-959595.min.css
diff --git a/Phraseanet-production-client/dist/skin-FFFFFF.css b/Phraseanet-production-client/dist/skin-FFFFFF.css
@@ -11250,7 +11250,6 @@ TABLE.explain3 TR TD {
 }
 
 .advanced_search_dialog_container.ui-dialog .add_new_term {
-  width: 54px;
   height: 20px;
   font-size: 12px;
   color: #979797;

diff --git a/Phraseanet-production-client/dist/skin-FFFFFF.min.css b/Phraseanet-production-client/dist/skin-FFFFFF.min.css
diff --git a/Phraseanet-production-client/src/components/preferences/index.js b/Phraseanet-production-client/src/components/preferences/index.js
@@ -129,6 +129,15 @@ const preferences = services => {
             }
         );
 
+        $container.on('change', '.preferences-see-real-field-name', event => {
+            let $el = $(event.currentTarget);
+            event.preventDefault();
+            appCommons.userModule.setPref(
+                'see_real_field_name',
+                $el.prop('checked') ? '1' : '0'
+            );
+        });
+
         $container.on('change', '.preferences-options-basket-status', event => {
             let $el = $(event.currentTarget);
             event.preventDefault();

diff --git a/Phraseanet-production-client/src/components/search/advSearch/searchAdvancedForm.js b/Phraseanet-production-client/src/components/search/advSearch/searchAdvancedForm.js
@@ -205,6 +205,15 @@ const searchAdvancedForm = (services) => {
         checkFilters(true);
     });
 
+    $('#ADVSRCH_FIELDS_ZONE input.see-real-field-name').change(function () {
+        if ($(this).prop('checked') === true) {
+            $(this).data('real-field', 'field_with_real_name');
+        } else {
+            $(this).data('real-field', 'field_without_real_name');
+        }
+        checkFilters(true);
+    });
+
     const checkFilters = (save) => {
         var danger = false;
         var search = {
@@ -323,13 +332,15 @@ const searchAdvancedForm = (services) => {
                 // at least one coll checked for this databox
                 // show again the relevant fields in "sort by" select
                 $('.db_' + sbas_id, fieldsSort).show().prop('disabled', false);
+
+                let realFieldClass = $('input.preferences-see-real-field-name').data('real-field');
                 // show again the relevant fields in "from fields" select
                 $('.db_' + sbas_id, fieldsSelect).show().prop('disabled', false);
-                $('.db_' + sbas_id, fieldsSelectFake).show().prop('disabled', false);
+                $('.db_' + sbas_id + '.' + realFieldClass, fieldsSelectFake).show().prop('disabled', false);
                 // show the sb
                 $('#ADVSRCH_SB_ZONE_' + sbas_id, container).show();
                 // show again the relevant fields in "date field" select
-                $('.db_' + sbas_id, dateFilterSelect).show().prop('disabled', false);
+                $('.db_' + sbas_id + '.' + realFieldClass, dateFilterSelect).show().prop('disabled', false);
             }
         });
 

diff --git a/Phraseanet-production-client/src/components/ui/workzone/facets/index.js b/Phraseanet-production-client/src/components/ui/workzone/facets/index.js
@@ -171,7 +171,7 @@ const workzoneFacets = services => {
                                 $(el).hide();
                             }
                         });
-                        ul.append('<button class="see_more_btn">See more</button>');
+                        ul.append('<button class="see_more_btn">' + localeService.t('seeMore') + '</button>');
                     }
                 });
                 $('.see_more_btn').on('click', function () {

diff --git a/Phraseanet-production-client/src/skins/style/ui-components/_modal-advanced-search.scss b/Phraseanet-production-client/src/skins/style/ui-components/_modal-advanced-search.scss
@@ -246,7 +246,6 @@
         color: #6e6e6e;
     }
     .add_new_term {
-        width: 54px;
         height: 20px;
         font-size: 12px;
         color: #979797;

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php
@@ -193,6 +193,7 @@ public function getTranslationsAction()
             'shareTitle'          => $translator->trans('prod::dialog sharebasket title'),
             'feedbackTitle'       => $translator->trans('prod::dialog feedback title'),
             'listmanagerTitle'    => $translator->trans('prod::dialog listmanager title'),
+            'seeMore'             => $translator->trans('prod::workzone:facet see more'),
         ]);
     }
 }
diff --git a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
@@ -62,7 +62,7 @@ public function getGlobals()
     {
         return [
             // change this version when you change JS file to force the navigation to reload js file
-            'assetFileVersion' => 90
+            'assetFileVersion' => 91
         ];
 
     }