Changeset 90095 in spip-zone

Timestamp:

Jun 10, 2015, 10:39:38 PM (6 years ago)

Author:

kent1@…

Message:

Améliorer la gestion des .po

Location:

_plugins_/trad-lang/trunk

Files:

• formulaires/tradlang_importer_langue.php (modified) (5 diffs)
• paquet.xml (modified) (1 diff)

_plugins_/trad-lang/trunk/formulaires/tradlang_importer_langue.php

@@ -74 +74 @@
                                 if(file_exists($dest_po)){
                                         lire_fichier($dest_po,$contenu_po);
-                                        preg_match_all(',(\#\, php-format|\#\, fuzzy\, php-format).*msgstr(.*)\#,Uims', $contenu_po,$matches);
+                                        preg_match_all(',(\#\, php-format|\#\, fuzzy\, php-format).*msgstr "(.*)\n(\n|\Z),Uims', $contenu_po,$matches);
                                         $array_po = array();
                                         foreach($matches[0] as $match){
                                                 $statut = "OK";
-                                                preg_match(',\#\| msgid \"(.*)\"\n,Uims',$match,$matches);
-                                                preg_match(',msgstr \"(.*)\n\#,Uims',$match,$matches_str);
+                                                preg_match(',msgstr \"(.*)\n(\n|\Z),Uims',$match,$matches_str);
                                                 $str = rtrim(trim($matches_str[1]),'"');
                                                 $str = trim(str_replace("\"\n\"","\n",$str));
+                                                preg_match(',\#\| msgid \"(.*)\"\n,Uims',$match,$matches);
+                                                if(!isset($matches[1]) || $matches[1] == ''){
+                                                        preg_match(',\nmsgid \"(.*)\nmsgstr,Uims',$match,$matches_str_orig);
+                                                        $str_orig = rtrim(trim($matches_str_orig[1]),'"');
+                                                        $str_orig = trim(str_replace("\"\n\"","",$str_orig));
+                                                        $matches[1] = sql_getfetsel('id','spip_tradlangs','id_tradlang_module='.intval($id_tradlang_module)." AND str=".sql_quote($str_orig));
+                                                }
                                                 if(preg_match(',\#\, fuzzy\, php-format,',$match,$matches_statut))
                                                         $statut = "MODIF";
                                                 if($str != '')
-                                                        $array_po[$matches[1]] = array('str'=>$str,'statut'=>$statut);
+                                                        $array_po[$matches[1]] = array('str'=>$str, 'statut'=>$statut);
                                         }
                                         $modifs = array();
@@ -192 +198 @@
                                                 else{
                                                         lire_fichier($dest,$contenu_po);
-                                                        preg_match_all(',(\#\, php-format|\#\, fuzzy\, php-format).*msgstr(.*)\#,Uims', $contenu_po,$matches);
+                                                        preg_match_all(',(\#\, php-format|\#\, fuzzy\, php-format).*msgstr "(.*)\n(\n|\Z),Uims', $contenu_po,$matches);
                                                         $array_po = array();
                                                         foreach($matches[0] as $match){
                                                                 $statut = "OK";
-                                                                preg_match(',\#\| msgid \"(.*)\"\n,Uims',$match,$matches);
-                                                                preg_match(',msgstr \"(.*)\n\#,Uims',$match,$matches_str);
+                                                                preg_match(',msgstr \"(.*)\n(\n|\Z),Uims',$match,$matches_str);
                                                                 $str = rtrim(trim($matches_str[1]),'"');
                                                                 $str = trim(str_replace("\"\n\"","\n",$str));
+                                                                preg_match(',\#\| msgid \"(.*)\"\n,Uims',$match,$matches);
+                                                                if(!isset($matches[1]) || $matches[1] == ''){
+                                                                        preg_match(',\nmsgid \"(.*)\nmsgstr,Uims',$match,$matches_str_orig);
+                                                                        $str_orig = rtrim(trim($matches_str_orig[1]),'"');
+                                                                        $str_orig = trim(str_replace("\"\n\"","",$str_orig));
+                                                                        $matches[1] = sql_getfetsel('id','spip_tradlangs','id_tradlang_module='.intval($id_tradlang_module)." AND str=".sql_quote($str_orig));
+                                                                }
                                                                 if(preg_match(',\#\, fuzzy\, php-format,',$match,$matches_statut))
                                                                         $statut = "MODIF";
                                                                 if($str != '')
-                                                                        $array_po[$matches[1]] = array('str'=>$str,'statut'=>$statut);
+                                                                        $array_po[$matches[1]] = array('str'=>$str, 'statut'=>$statut);
                                                         }
                                                         $langues_base = sql_allfetsel('id,str,statut','spip_tradlangs','id_tradlang_module='.intval($id_tradlang_module).' AND lang='.sql_quote($lang));
@@ -227 +239 @@
                         $erreurs['fichier_langue'] = _T('tradlang:erreur_upload_aucune_modif');
         }
-        spip_log($modifs,'test.'._LOG_ERREUR);
         return $erreurs;
 }
@@ -264 +275 @@
         if(!count($modifs))
                 $erreurs['message_erreur'] = _T('tradlang:erreur_upload_choisir_une');
-        spip_log($modifs,'test.'._LOG_ERREUR);
         return $erreurs;
 }
@@ -325 +335 @@
         else if(file_exists($dest = $dir_lang.$fichier_po)){
                 lire_fichier($dest,$contenu_po);
-                preg_match_all(',(\#\, php-format|\#\, fuzzy\, php-format).*msgstr(.*)\#,Uims', $contenu_po,$matches);
+                preg_match_all(',(\#\, php-format|\#\, fuzzy\, php-format).*msgstr "(.*)\n(\n|\Z),Uims', $contenu_po,$matches);
                 $array_po = array();
                 foreach($matches[0] as $match){
                         $statut = "OK";
-                        preg_match(',\#\| msgid \"(.*)\"\n,Uims',$match,$matches);
-                        preg_match(',msgstr \"(.*)\n\#,Uims',$match,$matches_str);
+                        preg_match(',msgstr \"(.*)\n(\n|\Z),Uims',$match,$matches_str);
                         $str = rtrim(trim($matches_str[1]),'"');
                         $str = trim(str_replace("\"\n\"","\n",$str));
-                        if(preg_match(',\#\, fuzzy\, php-format,',$match,$matches_statut)){
+                        preg_match(',\#\| msgid \"(.*)\"\n,Uims',$match,$matches);
+                        if(!isset($matches[1]) || $matches[1] == ''){
+                                preg_match(',\nmsgid \"(.*)\nmsgstr,Uims',$match,$matches_str_orig);
+                                $str_orig = rtrim(trim($matches_str_orig[1]),'"');
+                                $str_orig = trim(str_replace("\"\n\"","",$str_orig));
+                                $matches[1] = sql_getfetsel('id','spip_tradlangs','id_tradlang_module='.intval($id_tradlang_module)." AND str=".sql_quote($str_orig));
+                        }
+                        if(preg_match(',\#\, fuzzy\, php-format,',$match,$matches_statut))
                                 $statut = "MODIF";
-                        }
                         if($str != '')
-                                $array_po[$matches[1]] = array('str'=>$str,'statut'=>$statut);
+                                $array_po[$matches[1]] = array('str'=>$str, 'statut'=>$statut);
                 }
 

_plugins_/trad-lang/trunk/paquet.xml

@@ -2 +2 @@
         prefix="tradlang"
         categorie="outil"
-        version="2.4.1"
+        version="2.4.2"
         etat="stable"
         compatibilite="[3.0.0;3.1.*]"