tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT Added i18n::set_default_locale() to set standard locale (which is different from "current locale" retrieved through i18n::get_locale()) (from r103581)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112148 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-10-13 03:57:31 +00:00
parent 35378e577e
commit 60cd41a03b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/i18n.php
View File

@ -1685,7 +1685,7 @@ class i18n extends Object {
} }
/** /**
* @deprecated 2.4 Use Translatable::set_default_locale() * @deprecated 2.4 Use Translatable::set_default_locale() or i18n::set_default_locale()
* @param $lang String * @param $lang String
*/ */
static function set_default_lang($lang) { static function set_default_lang($lang) {
@ -1693,17 +1693,27 @@ class i18n extends Object {
} }
/** /**
* @deprecated 2.4 Use Translatable::default_locale() * @deprecated 2.4 Use Translatable::default_locale() or i18n::default_locale()
* @return String * @return String
*/ */
static function default_lang() { static function default_lang() {
return Translatable::default_locale(); return Translatable::default_locale();
} }
/**
* @return String
*/
static function default_locale() { static function default_locale() {
return self::$default_locale; return self::$default_locale;
} }
/**
* @param String $locale
*/
static function set_default_locale($locale) {
self::$default_locale = $locale;
}
/** /**
* Enables the multilingual content feature (proxy for Translatable::enable()). * Enables the multilingual content feature (proxy for Translatable::enable()).
* *