Merge pull request #130 from AcclaroInc/feature/custom-twig-regex-fil…

…ters Custom Twig RegEx Filters
AcclaroInc · Jan 16, 2021 · a2e5a11 · a2e5a11
2 parents a0ce357 + 523b44e
commit a2e5a11
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 6 deletions.
diff --git a/src/controllers/SettingsController.php b/src/controllers/SettingsController.php
@@ -235,6 +235,8 @@ public function actionConfigurationOptions()
 
         $variables['chkDuplicateEntries'] = Translations::getInstance()->settings->chkDuplicateEntries;
         $variables['uploadVolume'] = Translations::getInstance()->settings->uploadVolume;
+        $variables['twigSearchFilterSingleQuote'] = !empty(Translations::getInstance()->settings->twigSearchFilterSingleQuote) ? Translations::getInstance()->settings->twigSearchFilterSingleQuote : "";
+        $variables['twigSearchFilterDoubleQuote'] = !empty(Translations::getInstance()->settings->twigSearchFilterDoubleQuote) ? Translations::getInstance()->settings->twigSearchFilterDoubleQuote : "";
 
         $allVolumes = Craft::$app->getVolumes()->getAllVolumes();
 
@@ -264,12 +266,14 @@ public function actionSaveConfigurationOptions()
         $request = Craft::$app->getRequest();
         $duplicateEntries = $request->getParam('chkDuplicateEntries');
         $selectedVolume = $request->getParam('uploadVolume');
+        $twigSearchFilterSingleQuote = $request->getParam('twigSearchFilterSingleQuote');
+        $twigSearchFilterDoubleQuote = $request->getParam('twigSearchFilterDoubleQuote');
 
         try {
 
             $pluginService = Craft::$app->getPlugins();
             $plugin  = $pluginService->getPlugin('translations');
-            if (!$pluginService->savePluginSettings($plugin, ['chkDuplicateEntries' => $duplicateEntries, 'uploadVolume' => $selectedVolume])) {
+            if (!$pluginService->savePluginSettings($plugin, ['chkDuplicateEntries' => $duplicateEntries, 'uploadVolume' => $selectedVolume, 'twigSearchFilterSingleQuote' => $twigSearchFilterSingleQuote, 'twigSearchFilterDoubleQuote' => $twigSearchFilterDoubleQuote])) {
                 Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'Unable to save setting.'));
             } else {
                 Craft::$app->getSession()->setNotice(Translations::$plugin->translator->translate('app', 'Setting saved.'));

diff --git a/src/models/Settings.php b/src/models/Settings.php
@@ -26,6 +26,10 @@ class Settings extends Model
 {
     public $chkDuplicateEntries = true;
 
+    public $twigSearchFilterSingleQuote = "";
+
+    public $twigSearchFilterDoubleQuote = "";
+
     /** @var int The Volume ID where uploads will be saved */
     public $uploadVolume = 0;
 

diff --git a/src/services/repository/StaticTranslationsRepository.php b/src/services/repository/StaticTranslationsRepository.php
@@ -14,6 +14,7 @@
 use Exception;
 use craft\helpers\FileHelper;
 use craft\helpers\ElementHelper;
+use acclaro\translations\Translations;
 use craft\elements\db\ElementQueryInterface;
 use acclaro\translations\elements\StaticTranslations;
 
@@ -137,7 +138,8 @@ private function getFileStrings($path, $file, ElementQueryInterface $query, $cat
      * @return array
      */
     public function getExpressions($ext) {
-
+        $twigSearchFilterSingleQuote = !empty(Translations::getInstance()->settings->twigSearchFilterSingleQuote) ? Translations::getInstance()->settings->twigSearchFilterSingleQuote : '/\'((?:[^\']|\\\\\')*)\'\s*\|\s*t(?:ranslate)?\b/';
+        $twigSearchFilterDoubleQuote = !empty(Translations::getInstance()->settings->twigSearchFilterDoubleQuote) ? Translations::getInstance()->settings->twigSearchFilterDoubleQuote : '/"((?:[^"]|\\\\")*)"\s*\|\s*t(?:ranslate)?\b/';
         $exp = [];
         switch ($ext) {
             case 'php':
@@ -156,8 +158,7 @@ public function getExpressions($ext) {
                 $exp = [
                     'position' => '1',
                     'regex' => [
-                        '/\'((?:[^\']|\\\\\')*)\'\s*\|\s*t(?:ranslate)?\b/',
-                        '/"((?:[^"]|\\\\")*)"\s*\|\s*t(?:ranslate)?\b/',
+                        $twigSearchFilterSingleQuote, $twigSearchFilterDoubleQuote
                     ]
                 ];
                 break;
@@ -205,4 +206,4 @@ public function set($lang, array $fileContent)
 
         return true;
     }
-}
+}
diff --git a/src/templates/settings/configuration-options.twig b/src/templates/settings/configuration-options.twig
@@ -36,6 +36,24 @@
             toggle: true
         }) }}
 
+        <h3>{{ "Static Translations"|t('app') }}</h3>
+
+        {{ forms.textField({
+            label: "Twig search filter (single quote)"|t('app'),
+            id: 'twigSearchFilterSingleQuote',
+            name: 'twigSearchFilterSingleQuote',
+            value: twigSearchFilterSingleQuote ?? '',
+            size: '40',
+        }) }}
+
+        {{ forms.textField({
+            label: "Twig search filter (double quote)"|t('app'),
+            id: 'twigSearchFilterDoubleQuote',
+            name: 'twigSearchFilterDoubleQuote',
+            value: twigSearchFilterDoubleQuote ?? '',
+            size: '40',
+        }) }}
+
         <div class="buttons">
             <input type="submit" id="save-configuration" class="btn" value="{{ "Save"|t('app') }}" />
         </div>
@@ -50,4 +68,4 @@
             $('#save-configuration').toggleClass('submit');
         });
     });
-{% endjs %}
+{% endjs %}