------------------------------------------------------------
revno: 933
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Sat 2011-11-12 21:58:23 +0100
message:
l10 now use aiki site language
modified:
src/libs/languages.php*
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'src/libs/languages.php' (properties changed: +x to -x)
--- src/libs/languages.php 2011-11-08 13:42:45 +0000
+++ src/libs/languages.php 2011-11-12 20:58:23 +0000
@@ -99,11 +99,11 @@
* @retun string Parsed string. All ocurrences of __Something__ are replaced, in found in aiki_dictionary.
*/
public function L10n($string) {
- global $db, $config;
+ global $db, $aiki;
if (preg_match_all("/__([a-z_]{1,255})__/U", $string, $matches)){
- $default_language = "lang_".$config['default_language'];
+ $default_language = "lang_". $aiki->site->language();
$founded= array_unique($matches[1]);
unset($matches);
@@ -134,4 +134,4 @@
}
-?>
\ No newline at end of file
+?>
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp