Single-lang fix. Added plugin option for multi-language

Weble · Jan 26, 2023 · 854b81e · 854b81e
1 parent 6d536cb
commit 854b81e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 16 deletions.
diff --git a/plugin/src/AlgoliaSync.php b/plugin/src/AlgoliaSync.php
@@ -471,16 +471,25 @@ protected function findMenuItem($type, $id, $lang)
             );
 
             foreach (LanguageHelper::getContentLanguages() as $language) {
-
                 $app = CMSApplication::getInstance('site');
 
-                $menu_items = $app->getMenu('site')->getItems([
-                    'component_id',
-                    'language'
-                ], [
-                    \JComponentHelper::getComponent('com_zoo')->id,
-                    $language->lang_code
-                ]) ?: [];
+                $menu_items = array_merge(
+                // Multi-lang
+                    $app->getMenu('site')->getItems([
+                        'component_id',
+                        'language'
+                    ], [
+                        \JComponentHelper::getComponent('com_zoo')->id,
+                        $language->lang_code
+                    ]) ?: [],
+
+                    // Single-lang "*"
+                    $app->getMenu('site')->getItems([
+                        'component_id',
+                    ], [
+                        \JComponentHelper::getComponent('com_zoo')->id,
+                    ]) ?: [],
+                );
 
                 /** @var MenuItem $menu_item */
                 foreach ($menu_items as $menu_item) {
@@ -726,10 +735,6 @@ private function loadRouterLanguageRules(): void
             return;
         }
 
-        if (!PluginHelper::isEnabled('system', 'languagefilter')) {
-            return;
-        }
-
         $this->app = CMSApplication::getInstance('site');
         $this->lang_codes = LanguageHelper::getLanguages('lang_code');
         $this->default_lang = ComponentHelper::getParams('com_languages')->get('site', 'en-GB');
@@ -746,10 +751,14 @@ private function loadRouterLanguageRules(): void
             'preprocessBuildRule'
         ], Router::PROCESS_BEFORE);
 
-        $router->attachBuildRule([
-            $this,
-            'buildRule'
-        ], Router::PROCESS_BEFORE);
+
+        if ((bool) (new Registry(PluginHelper::getPlugin('system', 'zooalgolia')->params))->get('prepend_language')) {
+            $router->attachBuildRule([
+                $this,
+                'buildRule'
+            ], Router::PROCESS_BEFORE);
+        }
+
         $router->attachBuildRule([
             $this,
             'postprocessSEFBuildRule'

diff --git a/plugin/zooalgolia.xml b/plugin/zooalgolia.xml
@@ -22,6 +22,14 @@
     <config>
         <fields name="params">
             <fieldset name="basic">
+                <field name="prepend_language"
+                       type="list"
+                       default="0"
+                       label="Prepend Language"
+                >
+                    <option value="0">JNO</option>
+                    <option value="1">JYES</option>
+                </field>
             </fieldset>
         </fields>
     </config>