[TWiki-Dev] [SVN] r7200 - in twiki/branches/DEVELOP: . data/TWiki lib lib/TWiki

[<Ant...@nt...>]

Author: AntonioTerceiro
Date: 2005-10-28 12:30:37 -0700 (Fri, 28 Oct 2005)
New Revision: 7200

Modified:
   twiki/branches/DEVELOP/
   twiki/branches/DEVELOP/data/TWiki/DakarReleaseNotes.txt
   twiki/branches/DEVELOP/lib/TWiki.cfg
   twiki/branches/DEVELOP/lib/TWiki/I18N.pm
Log:
Item711: adding a setting for explicitly enabling/disabling i18n.



Property changes on: twiki/branches/DEVELOP
___________________________________________________________________
Name: svk:merge
   - 6fe119f3-adff-0310-8d65-eaf721ad8dcd:/local/twiki:10869
   + 6fe119f3-adff-0310-8d65-eaf721ad8dcd:/local/twiki:10876

Modified: twiki/branches/DEVELOP/data/TWiki/DakarReleaseNotes.txt
===================================================================
--- twiki/branches/DEVELOP/data/TWiki/DakarReleaseNotes.txt	2005-10-28 18:58:05 UTC (rev 7199)
+++ twiki/branches/DEVELOP/data/TWiki/DakarReleaseNotes.txt	2005-10-28 19:30:37 UTC (rev 7200)
@@ -118,6 +118,8 @@
 
 TWiki will now pick up the language you are using in your browser, and try to present system messages in that language, if it is available. If your preferred language is not available, TWiki will revert to English. You'll also have an option to choose a language different from that used in your browser.
 
+Internationalisation support is optional and enabled by the {UseInternationalisation} setting.
+
 The translation is performed by the Perl standard internationalization framework. If you want to contribute a new language, it would be most welcome: See TWiki:Codev.UserInterfaceLocalisation for instructions on how to help.
 
 ---+++ New options on the editing screen

Modified: twiki/branches/DEVELOP/lib/TWiki/I18N.pm
===================================================================
--- twiki/branches/DEVELOP/lib/TWiki/I18N.pm	2005-10-28 18:58:05 UTC (rev 7199)
+++ twiki/branches/DEVELOP/lib/TWiki/I18N.pm	2005-10-28 19:30:37 UTC (rev 7200)
@@ -101,6 +101,9 @@
 use vars qw( $initialised @initErrors );
 
 BEGIN {
+    # we only need to proceed if user wants internationalisation support
+    return unless $TWiki::cfg{UseInternationalisation};
+
     # we first assume it's ok
     $initialised = 1;
 

Modified: twiki/branches/DEVELOP/lib/TWiki.cfg
===================================================================
--- twiki/branches/DEVELOP/lib/TWiki.cfg	2005-10-28 18:58:05 UTC (rev 7199)
+++ twiki/branches/DEVELOP/lib/TWiki.cfg	2005-10-28 19:30:37 UTC (rev 7200)
@@ -455,22 +455,28 @@
 # </p>
 # <p>
 # <strong>Note:</strong> for user interface internationalization, the only
-# setting that matters here is {Site}{CharSet}, which controls which charset
-# TWiki will use for storing topics and displaying content for the users. As
-# soon as the requirements (<code>Locale::Maketext::Lexicon</code> and
-# <code>Encode</code> Perl modules) are installed (see the <em>CGI Setup</em>
-# section above), multi-language user intarface will <em>just</em> work.
+# settings that matters here are {UseInternationalisation}, which enables user
+# interface internationalisation, and {Site}{CharSet}, which controls which
+# charset TWiki will use for storing topics and displaying content for the
+# users. As soon as {UseInternationalisation} is set and the requirements
+# (<code>Locale::Maketext::Lexicon</code> and <code>Encode</code>/MapUTF8 Perl
+# modules) are installed (see the <em>CGI Setup</em> section above),
+# multi-language user interface will <em>just</em> work.
 # </p>
 
+# **BOOLEAN**
+# <strong>Internationalisation</strong> - set to enable user interface
+# internationalisation, i.e., presenting user interface in the user's language.
+$cfg{UseInternationalisation} = $FALSE;
+
 # **SELECT gmtime,servertime**
 # Set the timezone (this only effects the display of times,
 # all internal storage is still in GMT). May be gmtime or servertime
 $cfg{DisplayTimeValues} = 'gmtime';
 
 # **BOOLEAN**
-# Internationalisation
-# Set to enable operating system level locales and internationalisation support
-# for 8-bit character sets
+# Locale - set to enable operating system level locales and
+# internationalisation support for 8-bit character sets
 $cfg{UseLocale} = $FALSE;
 
 # **STRING 50**