Changeset 1571

Timestamp:

09/10/06 14:15:59 (2 years ago)

Author:

mbonetti

Message:

Fulltext language support

Location:

trunk/gregarius

Files:

• admin/config.php (modified) (2 diffs)
• admin/index.php (modified) (3 diffs)
• intl/cn_ZH/langinfo.txt (added)
• intl/de_DE/langinfo.txt (added)
• intl/dk_DK/langinfo.txt (added)
• intl/es_ES/langinfo.txt (added)
• intl/fr_FR/langinfo.txt (added)
• intl/he_IL/langinfo.txt (added)
• intl/it_IT/langinfo.txt (added)
• intl/ja_JP/langinfo.txt (added)
• intl/pt_BR/langinfo.txt (added)
• intl/pt_PT/langinfo.txt (added)
• intl/ru_RU/langinfo.txt (added)
• intl/sv_SV/langinfo.txt (added)
• schema.php (modified) (1 diff)

trunk/gregarius/admin/config.php

@@ -106 +106 @@
     case 'rss.output.lang':
         $arr = getLanguages();
-        echo $arr[getConfig('rss.output.lang')];
+        if (isset($arr[getConfig('rss.output.lang')]['language'])) {
+            echo $arr[getConfig('rss.output.lang')]['language'];
+        } else {
+            echo getConfig('rss.output.lang');
+        }
         break;
     case 'rss.config.tzoffset':
@@ -441 +445 @@
         $value = "";
         $langs = getLanguages();
-        foreach ($langs as $code => $name) {
+        foreach ($langs as $code => $info) {
+            if (isset($info['language'])) {
+                $l=$info['language'];
+            } else {
+                $l=$code;
+            }
             echo "<option value=\"$code\"";
             if ($code == $active_lang)   {
                 echo " selected=\"selected\"";
             }
-            echo ">".$langs[$code]."</option>\n";
+            echo ">$l</option>\n";
         }
         echo "</select>\n";

trunk/gregarius/admin/index.php

@@ -258 +258 @@
     $ret = array();
     $activeIdx = "0";
-    $ret['en_US']='en_US';
+    $ret['en_US']=array(
+        'language'=>'English',
+        'windows-locale'=>'english'
+    );
     while (false !== ($entry = $d->read())) {
         if (preg_match('#^[a-z]{2}_[A-Z]{2}$#',$entry)) {
-            $ret[$entry]=$entry;
+            $ret[$entry]=getLanguageInfo($entry);
         } 
     }
@@ -270 +273 @@
 
 
-function getLanguageInfo($file) {
+function getLanguageInfo($dir) {
     $info = array();
-    $path = "../intl/$file";
+    $path = "../intl/$dir/langinfo.txt";
     if (file_exists($path)) {
         $f = @fopen($path,'r');
@@ -283 +286 @@
         }
 
-        if ($contents && preg_match_all("/\/\/\/\s?([^:]+):(.*)/",$contents,$matches,PREG_SET_ORDER)) {
+        if ($contents && preg_match_all("/([^:]+):(.*)/",$contents,$matches,PREG_SET_ORDER)) {
             foreach($matches as $match) {
                 $key = trim(strtolower($match[1]));
                 $val = trim($match[2]);
-                if ($key == 'version') {
-                    $val=preg_replace('/[^0-9\.]+/','',$val);
-                }
-
                 $info[$key] = $val;
             }

trunk/gregarius/schema.php

@@ -447 +447 @@
         "rss.output.usepermalinks"  =>      array("true","true","boolean","Display a permalink icon and allow linking a given item directly.",NULL),
         "rss.config.markreadonupdate"=> array("false","false","boolean","Mark all old unread feeds as read when updating if new unread feeds are found.",NULL),
-        "rss.output.lang"           =>      array("en,es,fr,dk,it,pt_BR,se,0","en,es,fr,dk,it,pt_BR,se,0","enum","Language pack to use.",NULL),
+        "rss.output.lang"           =>      array("en_US,cn_ZH,de_DE,dk_DK,es_ES,fr_FR,he_IL,it_IT,ja_JP,pt_BR,pt_PT,ru_RU,sv_SV,0","en_US,cn_ZH,de_DE,dk_DK,es_ES,fr_FR,he_IL,it_IT,ja_JP,pt_BR,pt_PT,ru_RU,sv_SV,0","enum","Language pack to use.",NULL),
         "rss.config.absoluteordering"=> array("true","true","boolean","Allow feeds and folders to be ordered by their order in the admin section. If this option is set to false, channels and folders will be organized alphabetically by their titles.",NULL),
         "rss.config.robotsmeta"     =>      array("noindex,follow","noindex,follow","string","How should spiders crawl us? (see http://www.robotstxt.org/wc/meta-user.html for more info).",NULL),