Changeset 1429

Timestamp:

03/14/2010 02:32:39 PM (23 months ago)

Author:

Xiping.Wang

Message:

[omcollan_multilang] refactor multi lang setting

Location:

branches/omcollab_multilang

Files:

• _InstallationResources/.htaccess (modified) (1 diff)
• _InstallationResources/omconfig.php (modified) (1 diff)
• wiki/LocalSettings-en.php (deleted)
• wiki/LocalSettings-zh.php (deleted)
• wiki/LocalSettings.php (modified) (1 diff)

branches/omcollab_multilang/_InstallationResources/.htaccess

@@ -18 +18 @@
 
 # other languages
-RewriteRule ^wikizhsrc/(.*)$ /w/$1 [PT,L,QSA]
+RewriteRule ^wikizh/(.*)$ /w/$1 [PT,L,QSA]
 RewriteRule ^wiki/zh/(.*)$ /w/index.php?title=$1 [PT,L,QSA]
 RewriteRule ^wiki/zh/*$ wiki/zh/ [L,QSA]
 
 # default language - en
-RewriteRule ^wikiensrc/(.*)$ /w/$1 [PT,L,QSA]
 RewriteRule ^wiki/(.*)$ /w/index.php?title=$1 [PT,L,QSA]
 RewriteRule ^wiki/*$ wiki/ [L,QSA]

branches/omcollab_multilang/_InstallationResources/omconfig.php

@@ -78 +78 @@
 define( 'OMFORUM_APPLICATION_NAME'         , '{omforum_application_name}' );
 
-# [ omwiki script & article paths ]
-//define( 'OMWIKI_SCRIPT_PATH'           , '{omwiki_script_path}' );
-//define( 'OMWIKI_ARTICLE_PATH'          , '{omwiki_article_path}' );
-
 $callingURL = strtolower($_SERVER['REQUEST_URI']); //the requesting url
 // Let English language be processed at last
 if ( strpos( $callingURL, 'wiki/zh') |  strpos( $callingURL, 'wikizh')  ) {
-        define( 'OMWIKI_SCRIPT_PATH'           , '/wikizhsrc' );
+        define( 'OMWIKI_SCRIPT_PATH'           , '/wikizh' );
         define( 'OMWIKI_ARTICLE_PATH'          , '/wiki/zh/$1' );
 } else {
-        define( 'OMWIKI_SCRIPT_PATH'           , '/wikiensrc' );
-        define( 'OMWIKI_ARTICLE_PATH'          , '/wiki/$1' );
+        # [ omwiki script & article paths ]
+        define( 'OMWIKI_SCRIPT_PATH'           , '{omwiki_script_path}' );
+        define( 'OMWIKI_ARTICLE_PATH'          , '{omwiki_article_path}' );
 }
-
-
 
 # [ google codes (requires a google account) ]

branches/omcollab_multilang/wiki/LocalSettings.php

@@ -345 +345 @@
 // Let English language be processed at last
 if ( strpos( $callingURL, 'wiki/zh') |  strpos( $callingURL, 'wikizh')  ) {
-        require_once('LocalSettings-zh.php' );
+        // Chinese site
+        $wgDBprefix = 'zh_';
+        $wgArticlePath = 'wiki/zh/$1';
+        $wgScriptPath = '/wikizh';
+
+        // site name
+        $wgSitename = OMWIKI_APPLICATION_NAME.' (Chinese)'  ;
+        // 
+        # [ omwiki script & article paths ]
+        define( 'OMWIKI_SCRIPT_PATH'           , '/wikizh' );
+        define( 'OMWIKI_ARTICLE_PATH'          , '/wiki/zh/$1' );
+
 } else {
-        require_once('LocalSettings-en.php');
+        // default language - English
+        $wgDBprefix = OMWIKI_DB_TABLE_PREFIX;
+        $wgArticlePath = OMWIKI_ARTICLE_PATH;
+        $wgScriptPath = OMWIKI_SCRIPT_PATH;
+        // default site name
+        $wgSitename = OMWIKI_APPLICATION_NAME;
+        // 
+        # [ omwiki script & article paths ]
+        define( 'OMWIKI_SCRIPT_PATH'           , '/w' );
+        define( 'OMWIKI_ARTICLE_PATH'          , '/wiki/$1' );
 }