Changeset 120875 in spip-zone

Timestamp:

Jan 29, 2020, 1:36:31 PM (13 months ago)

Author:

Cerdic

Message:

ajouter le basename du repo dans le nom du module de langue, pour permettre de differencier les modules de meme nom mais de plugin differents

Location:

_plugins_/trad-lang/trunk

Files:

• . (modified) (2 props)
• paquet.xml (modified) (1 diff)
• salvatore/lecteur.php (modified) (3 diffs)
• tradlang_administrations.php (modified) (1 diff)
• tradlang_options.php (modified) (1 diff)

_plugins_/trad-lang/trunk/paquet.xml

@@ -6 +6 @@
         compatibilite="[3.2.0;3.3.*]"
         logo="images/spip_lang.png"
-        schema="1.1.1"
+        schema="1.2.0"
 >
 

_plugins_/trad-lang/trunk/salvatore/lecteur.php

@@ -94 +94 @@
                                 sql_updateq('spip_tradlang_modules', array('lang_mere' => $source['lang']), 'id_tradlang_module=' . intval($id_tradlang_module));
                                 salvatore_log("lang_mere mise a jour : " . $row_module['lang_mere'] . " => " . $source['lang']);
+                                $row_module['lang_mere'] = $source['lang'];
                                 $last_update = time();
                         }
@@ -103 +104 @@
                                 salvatore_log("dir_module mis a jour : " . $row_module['dir_module'] . " => " . $source['dir_module']);
                                 $last_update = time();
+                                $row_module['dir_module'] = $source['dir_module'];
+                        }
+                        /**
+                         * On met le titre a jour si jamais il a change (ou si on a change de facon de le calculer)
+                         */
+                        if (($t = calculer_nom_module($source['module'], $source['dir_module'])) !== $row_module['nom_mod']) {
+                                sql_updateq('spip_tradlang_modules', array('nom_mod' => $t), 'id_tradlang_module=' . intval($id_tradlang_module));
+                                salvatore_log("nom_mod mis a jour : " . $row_module['nom_mod'] . " => " . $t);
+                                $last_update = time();
+                                $row_module['nom_mod'] = $t;
                         }
                 }
@@ -124 +135 @@
                                         'module' => $source['module'],
                                         'dir_module' => $source['dir_module'],
-                                        'nom_mod' => $source['module'],
+                                        'nom_mod' => calculer_nom_module($source['module'],$source['dir_module']),
                                         'lang_prefix' => $source['module'],
                                         'lang_mere' => $source['lang'],

_plugins_/trad-lang/trunk/tradlang_administrations.php

@@ -127 +127 @@
         );
 
+        $maj['1.2.0'] = array(
+                array('tradlang_nommer_modules'),
+        );
+
         include_spip('base/upgrade');
         maj_plugin($nom_meta_base_version, $version_cible, $maj);
+}
+
+
+function tradlang_nommer_modules() {
+
+        $res = sql_select('*', 'spip_tradlang_modules', "nom_mod=module OR nom_mod='' AND dir_module!=''");
+        $nb = sql_count($res);
+        spip_log("tradlang_nommer_modules: $nb restants", 'maj');
+        while($row_module = sql_fetch($res)) {
+
+                $id_tradlang_module = $row_module['id_tradlang_module'];
+
+                $set = array(
+                        'nom_mod' => calculer_nom_module($row_module['module'], $row_module['dir_module']),
+                );
+                sql_updateq("spip_tradlang_modules", $set, "id_tradlang_module=".intval($id_tradlang_module));
+                if (time()>_TIME_OUT) {
+                        return;
+                }
+        }
 }
 

_plugins_/trad-lang/trunk/tradlang_options.php

@@ -38 +38 @@
         return tradlang_set($id_tradlang, $c);
 }
+
+
+function dir_module_to_basename($dir_module) {
+        $s = '';
+        if ($dir_module) {
+                $s = explode('--', $dir_module, 2);
+                $s = end($s);
+                $s = explode('-', $s);
+                array_pop($s);
+                $s = implode('-', $s);
+        }
+        return $s;
+}
+
+function calculer_nom_module($module, $dir_module) {
+        $nom = $module;
+        if (!$s = dir_module_to_basename($dir_module)) {
+                $s = '?';
+        }
+        $nom .= " [$s]";
+        return $nom;
+}