diff options
| author | mattpiwik <matthieu.aubry@gmail.com> | 2008-08-19 05:21:22 +0400 |
|---|---|---|
| committer | mattpiwik <matthieu.aubry@gmail.com> | 2008-08-19 05:21:22 +0400 |
| commit | 7e68e020a4416f66651465b752e97b70ca480d1c (patch) | |
| tree | 78fcef543146d97ee78ba7ec03c47b065e9e3245 /core/Translate.php | |
| parent | 3966c4c3628dec923d0471f1863926414194cc47 (diff) | |
Fixed the menu is now fully translatable! ouf
Fixed javascript handling of translations: we can now load translations strings in several places in the templates, they will all be concatenated into one bigger object
Fixed handling japanese error messages in API with correct charset
Finished (hopefuly?) to make all strings translatable.
Added colored logo now in login screen
All templates now defined the dates necessary to build the calendar, as we notice that most pages want to show the calendar.
Added destructor to LogStats/Db.php so that plugins don't have to call disconnect() on the object
Made JS tag smaller
Improved templates structuring, refactored CSS, etc. still lots to do in this area, if you wanna help?
git-svn-id: http://dev.piwik.org/svn/trunk@616 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/Translate.php')
| -rw-r--r-- | core/Translate.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/Translate.php b/core/Translate.php index a2d5f92af5..e53640b326 100644 --- a/core/Translate.php +++ b/core/Translate.php @@ -122,8 +122,10 @@ class Piwik_Translate } $js = substr($js,0,-1); $js .= '};'; + $js .= 'if(typeof(piwik_translations) == \'undefined\') { var piwik_translations = new Object; }'. + 'jQuery.each(translations, function(i, val) { console.log(val);piwik_translations[i] = val; } );'; $js .= 'function _pk_translate(tvar, str) { '. - 'var s = str; if( typeof(translations[tvar]) != \'undefined\' ) s = translations[tvar];'. + 'var s = str; if( typeof(piwik_translations[tvar]) != \'undefined\' ){ s = piwik_translations[tvar]; }'. 'return s;}'; return $js; |