@@ -3,13 +3,13 @@ class JsController extends JsAppController {
var $name = 'Js';
var $uses = array('Js.JsLang');
- function lang($lang, $jsFile=null) {
+ function lang() {
$cache = true;
if (Configure::read('debug')) {
$cache = false;
}
- if ($js = $this->JsLang->i18n($lang, $jsFile, $cache)) {
+ if ($js = $this->JsLang->i18n($this->params['pass'], $cache)) {
header('Content-type: text/javascript');
echo $js;
die;
controllers/js_controller.php
@@ -10,25 +10,26 @@ class JsLang extends JsAppModel {
function init() {
App::import('Core', 'L10n');
-
+
$this->paths['source'] = JS . 'source' . DS;
- if(Configure::read('Js.paths')) {
+ if (Configure::read('Js.paths')) {
$this->paths = array_merge($this->paths, Configure::read('Js.paths'));
}
}
- function i18n($lang, $jsFile=null, $cache=false) {
+ function i18n($params, $cache=false) {
$this->init();
-
- $cacheFile = $jsFile;
- if ($jsFile == null && preg_match('/\.js$/i', $lang)) {
- $cacheFile = $lang;
+
+ $cacheFile = implode(DS, $params);
+ if (count($params) == 1 && preg_match('/\.js$/i', $params[0])) {
+ $lang = str_replace('.js', '', $params[0]);
$jsFile = 'lang.js';
- $lang = str_replace('.js', '', $lang);
} else {
- $cacheFile = $lang . DS . $cacheFile;
+ $lang = $params[0];
+ unset($params[0]);
+ $jsFile = implode(DS, $params);
}
-
+
$L10n = new L10n();
if (!$L10n->map($lang)) {
$lang = null;
@@ -40,11 +41,11 @@ class JsLang extends JsAppModel {
ob_start();
include $sourceJsFile;
$js = ob_get_clean();
-
- if($cache) {
+
+ if ($cache) {
$this->write($cacheFile, $js);
}
-
+
return $js;
}
models/js_lang.php
@@ -36,19 +36,19 @@ class JsLangTestCase extends CakeTestCase {
}
function testI18nEn() {
- $result = $this->JsLang->i18n('en', 'test.js');
+ $result = $this->JsLang->i18n(array('en', 'test.js'));
$expected = 'alert("Hello World");';
$this->assertEqual($result, $expected);
}
function testI18nEs() {
- $result = $this->JsLang->i18n('es', 'test.js');
+ $result = $this->JsLang->i18n(array('es', 'test.js'));
$expected = 'alert("Hola World");';
$this->assertEqual($result, $expected);
}
function testLangEn() {
- $result = $this->JsLang->i18n('en.js');
+ $result = $this->JsLang->i18n(array('en.js'));
$expected = <<<END
var Lang =
{
@@ -59,7 +59,7 @@ END;
}
function testLangEs() {
- $result = $this->JsLang->i18n('es.js');
+ $result = $this->JsLang->i18n(array('es.js'));
$expected = <<<END
var Lang =
{
@@ -69,6 +69,12 @@ END;
$this->assertEqual($result, $expected);
}
+ function testLangEnSub() {
+ $result = $this->JsLang->i18n(array('en', 'sub', 'sub.js'));
+ $expected = 'alert("JS in sub folder");';
+ $this->assertEqual($result, $expected);
+ }
+
function testWrite() {
$expected = 'alert("Hola World");';
$this->JsLang->write('es/test.js', $expected);
tests/cases/models/js_lang.test.php
@@ -15,4 +15,7 @@ msgid "Hello W"
msgstr "Hello World"
msgid "This is a test"
-msgstr "A test is this"
\ No newline at end of file
+msgstr "A test is this"
+
+msgid "Sub Message"
+msgstr "JS in sub folder"
\ No newline at end of file
tests/test_app/locale/eng/LC_MESSAGES/default.po
@@ -15,4 +15,7 @@ msgid "Hello W"
msgstr "Hola World"
msgid "This is a test"
-msgstr "El test-o"
\ No newline at end of file
+msgstr "El test-o"
+
+msgid "Sub Message"
+msgstr "El Message Sub"
\ No newline at end of file
tests/test_app/locale/spa/LC_MESSAGES/default.po
817861a589fee6b615de9486d9cc8e16d82fa38e
unknown
matt@mcurry.net
http://github.com/mcurry/js/commit/da8607364c22b47523ee65990847482c3a7aebd7
da8607364c22b47523ee65990847482c3a7aebd7
2009-05-28T20:59:49-07:00
2009-05-28T20:59:49-07:00
fix js in sub folders
b39c971426873b0ee0ed842d2c6fc3b4bbdbf67c
unknown
matt@mcurry.net