diff options
| author | mattpiwik <matthieu.aubry@gmail.com> | 2011-01-07 14:28:33 +0300 |
|---|---|---|
| committer | mattpiwik <matthieu.aubry@gmail.com> | 2011-01-07 14:28:33 +0300 |
| commit | 5d4a89d53a6321e1a172dc05430c14dba1e8561e (patch) | |
| tree | 0ae77f17fe41090c5bf71cbebb321c6036cc0904 /core/Translate.php | |
| parent | 62dd9f0fbe77f3824bd036e32f99e703ddc2711a (diff) | |
Fixes #1382
* now preventing editing 2 rows at once
* adding large SAVE button below the name on the left of the table (+ Cancel link which refreshes pages)
Fixes #1980
* simplifying admin CSS, reusing same styles as PDF, Goals and datatables
* deleting now unused icons & styles
git-svn-id: http://dev.piwik.org/svn/trunk@3663 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/Translate.php')
| -rw-r--r-- | core/Translate.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/Translate.php b/core/Translate.php index 16115d4ada..25c326860e 100644 --- a/core/Translate.php +++ b/core/Translate.php @@ -148,8 +148,15 @@ class Piwik_Translate } $moduleRegex = substr($moduleRegex, 0, -1); $moduleRegex .= ')_.*_js$#i'; - - foreach($GLOBALS['Piwik_translations'] as $key => $value) + + // Hack: common translations used in JS but not only, force as them to be defined in JS + $translations = $GLOBALS['Piwik_translations']; + $toSetInJs = array('General_Save', 'General_OrCancel'); + foreach($toSetInJs as $toSetId) + { + $translations[$toSetId.'_js'] = $translations[$toSetId]; + } + foreach($translations as $key => $value) { if( preg_match($moduleRegex,$key) ) { $js .= '"'.$key.'": "'.str_replace('"','\"',$value).'",'; |