Changeset 3817:9cbb20f63f8b

Timestamp:

08/23/18 09:36:21 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Blogroll plugin:

• Add french locales for XFN
• Add link to XFN information (wikipedia, better than nothing)
• Switch from text field to combo list (with most used listed first) for link language

Should closes #2276, #2277 and #2278

Files:

• locales/en/plugins.po (modified) (1 diff)
• locales/fr/plugins.po (modified) (1 diff)
• plugins/blogroll/class.dc.blogroll.php (modified) (1 diff)
• plugins/blogroll/edit.php (modified) (3 diffs)

locales/en/plugins.po

@@ -469 +469 @@
 msgstr ""
 
+msgid "More information on <a href="https://en.wikipedia.org/wiki/XHTML_Friends_Network">Wikipedia</a> website"
+msgstr ""
+
 msgid "_xfn_Me"
 msgstr "Me"

locales/fr/plugins.po

@@ -476 +476 @@
 msgstr "Informations XFN"
 
+msgid "More information on <a href="https://en.wikipedia.org/wiki/XHTML_Friends_Network">Wikipedia</a> website"
+msgstr "Plus d'information sur le site <a href="https://fr.wikipedia.org/wiki/XHTML_Friends_Network">Wikipedia</a>"
+
 msgid "_xfn_Me"
-msgstr "_xfn_Me"
+msgstr "Identité"
 
 msgid "_xfn_Another link for myself"
-msgstr "_xfn_Another link for myself"
+msgstr "Une autre de mes adresses Web"
 
 msgid "_xfn_Friendship"
-msgstr "_xfn_Friendship"
+msgstr "Amitié"
 
 msgid "_xfn_Contact"
-msgstr "_xfn_Contact"
+msgstr "Contact"
 
 msgid "_xfn_Acquaintance"
-msgstr "_xfn_Acquaintance"
+msgstr "Connaissance"
 
 msgid "_xfn_Friend"
-msgstr "_xfn_Friend"
+msgstr "Ami·e"
 
 msgid "_xfn_Physical"
-msgstr "_xfn_Physical"
+msgstr "Physique"
 
 msgid "_xfn_Met"
-msgstr "_xfn_Met"
+msgstr "Rencontré·e"
 
 msgid "_xfn_Professional"
-msgstr "_xfn_Professional"
+msgstr "Professionnel"
 
 msgid "_xfn_Co-worker"
-msgstr "_xfn_Co-worker"
+msgstr "Collègue de travail"
 
 msgid "_xfn_Colleague"
-msgstr "_xfn_Colleague"
+msgstr "Consœur ou Confrère"
 
 msgid "_xfn_Geographical"
-msgstr "_xfn_Geographical"
+msgstr "Géographique"
 
 msgid "_xfn_Co-resident"
-msgstr "_xfn_Co-resident"
+msgstr "Colocataire"
 
 msgid "_xfn_Neighbor"
-msgstr "_xfn_Neighbor"
+msgstr "Voisin"
 
 msgid "_xfn_Family"
-msgstr "_xfn_Family"
+msgstr "Famille"
 
 msgid "_xfn_Child"
-msgstr "_xfn_Child"
+msgstr "Enfant"
 
 msgid "_xfn_Parent"
-msgstr "_xfn_Parent"
+msgstr "Parent"
 
 msgid "_xfn_Sibling"
-msgstr "_xfn_Sibling"
+msgstr "Sœur/frère"
 
 msgid "_xfn_Spouse"
-msgstr "_xfn_Spouse"
+msgstr "Conjoint·e"
 
 msgid "_xfn_Kin"
-msgstr "_xfn_Kin"
+msgstr "Famille"
 
 msgid "_xfn_Romantic"
-msgstr "_xfn_Romantic"
+msgstr "Romantique"
 
 msgid "_xfn_Muse"
-msgstr "_xfn_Muse"
+msgstr "Muse"
 
 msgid "_xfn_Crush"
-msgstr "_xfn_Crush"
+msgstr "Coup de foudre"
 
 msgid "_xfn_Date"
-msgstr "_xfn_Date"
+msgstr "Petit·e ami·e"
 
 msgid "_xfn_Sweetheart"
-msgstr "_xfn_Sweetheart"
+msgstr "Être aimé"
 
 msgid "Nothing to import"

plugins/blogroll/class.dc.blogroll.php

@@ -46 +46 @@
     }
 
+    public function getLangs($params = array())
+    {
+        // Use post_lang as an alias of link_lang to be able to use the dcAdminCombos::getLangsCombo() function
+        $strReq = 'SELECT COUNT(link_id) as nb_link, link_lang as post_lang ' .
+        'FROM ' . $this->table . ' ' .
+        "WHERE blog_id = '" . $this->con->escape($this->blog->id) . "' " .
+            "AND link_lang <> '' " .
+            "AND link_lang IS NOT NULL ";
+
+        if (isset($params['lang'])) {
+            $strReq .= "AND link_lang = '" . $this->con->escape($params['lang']) . "' ";
+        }
+
+        $strReq .= 'GROUP BY link_lang ';
+
+        $order = 'desc';
+        if (!empty($params['order']) && preg_match('/^(desc|asc)$/i', $params['order'])) {
+            $order = $params['order'];
+        }
+        $strReq .= 'ORDER BY link_lang ' . $order . ' ';
+
+        return $this->con->select($strReq);
+    }
+
     public function getLink($id)
     {

plugins/blogroll/edit.php

@@ -84 +84 @@
 }
 
+# Languages combo
+$links      = $blogroll->getLangs(array('order' => 'asc'));
+$lang_combo = dcAdminCombos::getLangsCombo($links, true);
+
 ?>
 <html>
@@ -147 +151 @@
 
     '<p><label for="link_lang">' . __('Language:') . '</label> ' .
-    form::field('link_lang', 5, 5, html::escapeHTML($link_lang)) . '</p>' .
+    form::combo('link_lang', $lang_combo, $link_lang) .
+    '</p>' .
+
     '</div>' .
 
@@ -153 +159 @@
     '<div class="col70 last-col">' .
     '<h3>' . __('XFN information') . '</h3>' .
+    '<p class="clear form-note">' . __('More information on <a href="https://en.wikipedia.org/wiki/XHTML_Friends_Network">Wikipedia</a> website') . '</p>' .
+
     '<div class="table-outer">' .
     '<table class="noborder">' .