enh: code enhancement

b2un0 · b2un0 · commit d28bf74b2efb · 2015-04-06T19:57:18.000+02:00
new: fr-FR translation
new: de-DE translation
diff --git a/com_k2.php b/com_k2.php
@@ -14,12 +14,12 @@ class xmap_com_k2
     /**
      * @var array
      */
-    private static $layouts = array('category', 'tag', 'user');
+    protected static $layouts = array('category', 'tag', 'user');
 
     /**
      * @var bool
      */
-    private static $enabled = false;
+    protected static $enabled = false;
 
     public function __construct()
     {
@@ -33,15 +33,15 @@ public function __construct()
      * @param stdClass $parent
      * @param array $params
      *
-     * @throws Exception
+     * @return bool
      */
     public static function getTree($xmap, stdClass $parent, array &$params)
     {
         $uri = new JUri($parent->link);
 
         if (!self::$enabled || !in_array($uri->getVar('layout'), self::$layouts))
         {
-            return;
+            return false;
         }
 
         $params['groups'] = implode(',', JFactory::getUser()->getAuthorisedViewLevels());
@@ -55,53 +55,39 @@ public static function getTree($xmap, stdClass $parent, array &$params)
         $params['show_unauth'] = ($params['show_unauth'] == 1 || ($params['show_unauth'] == 2 && $xmap->view == 'xml') || ($params['show_unauth'] == 3 && $xmap->view == 'html'));
 
         $params['category_priority'] = JArrayHelper::getValue($params, 'category_priority', $parent->priority);
-        $params['category_changefreq'] = JArrayHelper::getValue($params, 'category_changefreq', $parent->changefreq);
-
-        if ($params['category_priority'] == -1)
-        {
-            $params['category_priority'] = $parent->priority;
-        }
+        $params['category_priority'] = ($params['category_priority'] == -1) ? $parent->priority : $params['category_priority'];
 
-        if ($params['category_changefreq'] == -1)
-        {
-            $params['category_changefreq'] = $parent->changefreq;
-        }
+        $params['category_changefreq'] = JArrayHelper::getValue($params, 'category_changefreq', $parent->changefreq);
+        $params['category_changefreq'] = ($params['category_changefreq'] == -1) ? $parent->changefreq : $params['category_changefreq'];
 
         $params['item_priority'] = JArrayHelper::getValue($params, 'item_priority', $parent->priority);
-        $params['item_changefreq'] = JArrayHelper::getValue($params, 'item_changefreq', $parent->changefreq);
-
-        if ($params['item_priority'] == -1)
-        {
-            $params['item_priority'] = $parent->priority;
-        }
+        $params['item_priority'] = ($params['item_priority'] == -1) ? $parent->priority : $params['item_priority'];
 
-        if ($params['item_changefreq'] == -1)
-        {
-            $params['item_changefreq'] = $parent->changefreq;
-        }
+        $params['item_changefreq'] = JArrayHelper::getValue($params, 'item_changefreq', $parent->changefreq);
+        $params['item_changefreq'] = ($params['item_changefreq'] == -1) ? $parent->changefreq : $params['item_changefreq'];
 
         switch ($uri->getVar('layout'))
         {
             case 'category':
                 $categories = JFactory::getApplication()->getMenu()->getItem($parent->id)->params->get('categories');
                 if (count($categories) == 1)
                 {
-                    self::getItems($xmap, $parent, $params, 'category', $categories[0]);
+                    return self::getItems($xmap, $parent, $params, 'category', $categories[0]);
                 } elseif (count($categories) > 1)
                 {
-                    self::getCategoryTree($xmap, $parent, $params, 0, $categories);
+                    return self::getCategoryTree($xmap, $parent, $params, 0, $categories);
                 } else
                 {
-                    self::getCategoryTree($xmap, $parent, $params, 0);
+                    return self::getCategoryTree($xmap, $parent, $params, 0);
                 }
                 break;
 
             case 'tag':
-                self::getItems($xmap, $parent, $params, 'tag', $uri->getVar('tag'));
+                return self::getItems($xmap, $parent, $params, 'tag', $uri->getVar('tag'));
                 break;
 
             case 'user':
-                self::getItems($xmap, $parent, $params, 'user', $uri->getVar('id'));
+                return self::getItems($xmap, $parent, $params, 'user', $uri->getVar('id'));
                 break;
         }
     }
@@ -110,10 +96,12 @@ public static function getTree($xmap, stdClass $parent, array &$params)
      * @param XmapDisplayerInterface $xmap
      * @param stdClass $parent
      * @param array $params
-     * @param $mode
+     * @param string $mode
      * @param int $linkId
+     *
+     * @return bool
      */
-    private static function getItems($xmap, stdClass $parent, array &$params, $mode, $linkId)
+    protected static function getItems($xmap, stdClass $parent, array &$params, $mode, $linkId)
     {
         if ($mode == 'category')
         {
@@ -122,7 +110,7 @@ private static function getItems($xmap, stdClass $parent, array &$params, $mode,
 
         if (!$params['include_items'])
         {
-            return;
+            return false;
         }
 
         $db = JFactory::getDbo();
@@ -173,18 +161,26 @@ private static function getItems($xmap, stdClass $parent, array &$params, $mode,
         }
 
         $db->setQuery($query);
-        $rows = $db->loadObjectList();
+
+        try
+        {
+            $rows = $db->loadObjectList();
+
+        } catch (RuntimeException $e)
+        {
+            return false;
+        }
 
         if (empty($rows))
         {
-            return;
+            return false;
         }
 
         $xmap->changeLevel(1);
 
         foreach ($rows as $row)
         {
-            $node = new stdclass;
+            $node = new stdClass;
             $node->id = $parent->id;
             $node->name = $row->title;
             $node->title = $row->title;
@@ -201,6 +197,8 @@ private static function getItems($xmap, stdClass $parent, array &$params, $mode,
         }
 
         $xmap->changeLevel(-1);
+
+        return true;
     }
 
     /**
@@ -209,8 +207,10 @@ private static function getItems($xmap, stdClass $parent, array &$params, $mode,
      * @param array $params
      * @param int $parent_id
      * @param int[]|null $ids
+     *
+     * @return bool
      */
-    private static function getCategoryTree($xmap, stdClass $parent, array &$params, $parent_id, $ids = null)
+    protected static function getCategoryTree($xmap, stdClass $parent, array &$params, $parent_id, $ids = null)
     {
         $db = JFactory::getDbo();
 
@@ -240,18 +240,26 @@ private static function getCategoryTree($xmap, stdClass $parent, array &$params,
         }
 
         $db->setQuery($query);
-        $rows = $db->loadObjectList();
+
+        try
+        {
+            $rows = $db->loadObjectList();
+
+        } catch (RuntimeException $e)
+        {
+            return false;
+        }
 
         if (empty($rows))
         {
-            return;
+            return false;
         }
 
         $xmap->changeLevel(1);
 
         foreach ($rows as $row)
         {
-            $node = new stdclass;
+            $node = new stdClass;
             $node->id = $parent->id;
             $node->name = $row->name;
             $node->uid = $parent->uid . '_cid_' . $row->id;
@@ -268,5 +276,7 @@ private static function getCategoryTree($xmap, stdClass $parent, array &$params,
         }
 
         $xmap->changeLevel(-1);
+
+        return true;
     }
-}
+}
diff --git a/com_k2.xml b/com_k2.xml
@@ -18,6 +18,10 @@
     <languages folder="language">
         <language tag="en-GB">en-GB/en-GB.plg_xmap_com_k2.ini</language>
         <language tag="en-GB">en-GB/en-GB.plg_xmap_com_k2.sys.ini</language>
+        <language tag="de-DE">de-DE/de-DE.plg_xmap_com_k2.ini</language>
+        <language tag="de-DE">de-DE/de-DE.plg_xmap_com_k2.sys.ini</language>
+        <language tag="fr-FR">fr-FR/fr-FR.plg_xmap_com_k2.ini</language>
+        <language tag="fr-FR">fr-FR/fr-FR.plg_xmap_com_k2.sys.ini</language>
     </languages>
     <config>
         <fields name="params">
diff --git a/language/de-DE/de-DE.plg_xmap_com_k2.ini b/language/de-DE/de-DE.plg_xmap_com_k2.ini
@@ -0,0 +1,31 @@
+PLG_XMAP_COM_CONTENT = "Xmap - K2 Integration"
+PLG_XMAP_COM_CONTENT_DESC = "Unterstützung für Kategorien, Tags und Benutzer"
+
+PLG_XMAP_COM_K2_INCLUDE_ITEMS_LABEL = "Beiträge einbinden"
+PLG_XMAP_COM_K2_INCLUDE_ITEMS_DESC = "Auswählen wann Beiträge mit in die Sitemap eingebunden werden sllen"
+
+PLG_XMAP_COM_K2_SHOW_UNAUTH_LABEL = "Nicht zugängliche Links anzeigen"
+PLG_XMAP_COM_K2_SHOW_UNAUTH_DESC = "Wenn Ja, die Links zu registrienten Inhalte werden angezeigt auch wenn der Benutzer nicht eingeloggt ist. Der Benutzer muss sich einloggen um den kompletten Inhalt zu sehen."
+
+PLG_XMAP_COM_K2_CATEGORY_PRIORITY_LABEL = "Priorität für Kategorien"
+PLG_XMAP_COM_K2_CATEGORY_PRIORITY_DESC = "Die Priorität für die Kategorien setzen"
+
+PLG_XMAP_COM_K2_CATEGORY_CHANGE_FREQ_LABEL = "Häufigkeit der Aktualisierung für Kategorien"
+PLG_XMAP_COM_K2_CATEGORY_CHANGE_FREQ_DESC = "Die Häufigkeit der Aktualisierung für die Kategorien setzen"
+
+PLG_XMAP_COM_K2_ITEM_PRIORITY_LABEL = "Priorität für Einträge"
+PLG_XMAP_COM_K2_ITEM_PRIORITY_DESC = "Die Priorität für die Einträge setzen"
+
+PLG_XMAP_COM_K2_ITEM_CHANGE_FREQ_LABEL = "Häufigkeit der Aktualisierung für Einträge"
+PLG_XMAP_COM_K2_ITEM_CHANGE_FREQ_DESC = "Die Häufigkeit der Aktualisierung für die Einträge setzen"
+
+PLG_XMAP_COM_CONTENT_OPTION_USE_PARENT_MENU = "Einstellungen des übergeordneten Menüpunkts benutzen"
+PLG_XMAP_COM_CONTENT_OPTION_NEVER = "Nie"
+PLG_XMAP_COM_CONTENT_OPTION_ALWAYS = "Immer"
+PLG_XMAP_COM_CONTENT_OPTION_XML_ONLY = "Nur in der XML Sitemap"
+PLG_XMAP_COM_CONTENT_OPTION_HTML_ONLY = "Nur in der HTML Sitemap"
+PLG_XMAP_COM_CONTENT_OPTION_WEEKLY = "Wöchentlich"
+PLG_XMAP_COM_CONTENT_OPTION_DAILY = "Täglich"
+PLG_XMAP_COM_CONTENT_OPTION_MONTHLY = "Monatlich"
+PLG_XMAP_COM_CONTENT_OPTION_YEARLY = "Jährlich"
+PLG_XMAP_COM_CONTENT_OPTION_HOURLY = "Stündlich"
diff --git a/language/de-DE/de-DE.plg_xmap_com_k2.sys.ini b/language/de-DE/de-DE.plg_xmap_com_k2.sys.ini
@@ -0,0 +1,2 @@
+PLG_XMAP_COM_CONTENT = "Xmap - K2 Integration"
+PLG_XMAP_COM_CONTENT_DESC = "Unterstützung für Kategorien, Tags und Benutzer"
diff --git a/language/en-GB/en-GB.plg_xmap_com_k2.ini b/language/en-GB/en-GB.plg_xmap_com_k2.ini
@@ -28,4 +28,4 @@ PLG_XMAP_COM_K2_WEEKLY = "Weekly"
 PLG_XMAP_COM_K2_DAILY = "Daily"
 PLG_XMAP_COM_K2_MONTHLY = "Monthly"
 PLG_XMAP_COM_K2_YEARLY = "Yearly"
-PLG_XMAP_COM_K2_HOURLY = "Hourly"
+PLG_XMAP_COM_K2_HOURLY = "Hourly"
diff --git a/language/en-GB/en-GB.plg_xmap_com_k2.sys.ini b/language/en-GB/en-GB.plg_xmap_com_k2.sys.ini
@@ -1,2 +1,2 @@
 PLG_XMAP_COM_K2 = "Xmap - K2 Integration"
-PLG_XMAP_COM_K2_DESC = "K2 Integration into Xmap and add support for categories, tags and users"
+PLG_XMAP_COM_K2_DESC = "K2 Integration into Xmap and add support for categories, tags and users"
diff --git a/language/fr-FR/fr-FR.plg_xmap_com_k2.ini b/language/fr-FR/fr-FR.plg_xmap_com_k2.ini
@@ -0,0 +1,31 @@
+PLG_XMAP_COM_K2_ = "Xmap - Plugin pour K2"
+PLG_XMAP_COM_K2_DESC = "Ce plugin permet de prendre en charge les catégories et articles de K2 dans les plans de site générés par Xmap."
+
+PLG_XMAP_COM_K2_FOLLOW_SUBCATEGORIES = "Sous-catégories"
+PLG_XMAP_COM_K2_FOLLOW_SUBCATEGORIES_DESC = "Sélectionnez si les sous-catégories doivent être listées ou non."
+
+PLG_XMAP_COM_K2_SUPRESS_DUPLICATES = "Masquer les doublons"
+PLG_XMAP_COM_K2_SUPRESS_DUPLICATES_DESC = "Sélectionnez si les éléments en double doivent être masqués ou non."
+
+PLG_XMAP_COM_K2_SHOW_ITEMS_LABEL = "Articles"
+PLG_XMAP_COM_K2_SHOW_ITEMS_LABEL_DESC = "Choisissez si, et dans quel type de plan de site, les articles doivent être inclus sous les liens des catégories."
+
+PLG_XMAP_COM_K2_XML_SITEMAP = "Plan de site XML"
+PLG_XMAP_COM_K2_XML_SITEMAP_DESC = "Propriétés spécifiques au plans XML."
+
+PLG_XMAP_COM_K2_PRIORITY = "Priorité des éléments"
+PLG_XMAP_COM_K2_PRIORITY_DESC = "Spécifiez la priorité pour les éléments."
+
+PLG_XMAP_COM_K2_CHANGEFREQ_LABEL = "Fréquence de changement"
+PLG_XMAP_COM_K2_CHANGEFREQ_LABEL_DESC = "Spécifiez la fréquence de modification des éléments."
+
+PLG_XMAP_COM_K2_OPTION_USE_PARENT_MENU = "Utiliser les paramètres du menu parent"
+PLG_XMAP_COM_K2_OPTION_NEVER = "Jamais"
+PLG_XMAP_COM_K2_OPTION_ALWAYS = "Toujours"
+PLG_XMAP_COM_K2_OPTION_XML_ONLY = "Uniquement dans le plan du site XML "
+PLG_XMAP_COM_K2_OPTION_HTML_ONLY = "Uniquement dans le plan du site HTML"
+PLG_XMAP_COM_K2_OPTION_WEEKLY = "Hebdomadaire"
+PLG_XMAP_COM_K2_OPTION_DAILY = "Quotidien"
+PLG_XMAP_COM_K2_OPTION_MONTHLY = "Mensuel"
+PLG_XMAP_COM_K2_OPTION_YEARLY = "Annuel"
+PLG_XMAP_COM_K2_OPTION_HOURLY = "Horaire"
diff --git a/language/fr-FR/fr-FR.plg_xmap_com_k2.sys.ini b/language/fr-FR/fr-FR.plg_xmap_com_k2.sys.ini
@@ -0,0 +1,2 @@
+PLG_XMAP_COM_K2_ = "Xmap - Plugin pour K2"
+PLG_XMAP_COM_K2_DESC = "Ce plugin permet de prendre en charge les catégories et articles de K2 dans les plans de site générés par Xmap."

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+PLG_XMAP_COM_CONTENT = "Xmap - K2 Integration"`
	`2`	`+PLG_XMAP_COM_CONTENT_DESC = "Unterstützung für Kategorien, Tags und Benutzer"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`PLG_XMAP_COM_K2 = "Xmap - K2 Integration"`
`2`		`-PLG_XMAP_COM_K2_DESC = "K2 Integration into Xmap and add support for categories, tags and users"`
	`2`	`+PLG_XMAP_COM_K2_DESC = "K2 Integration into Xmap and add support for categories, tags and users"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+PLG_XMAP_COM_K2_ = "Xmap - Plugin pour K2"`
	`2`	`+PLG_XMAP_COM_K2_DESC = "Ce plugin permet de prendre en charge les catégories et articles de K2 dans les plans de site générés par Xmap."`