tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4290-Opciones-Adicionales-Templates-Alertas-Idiomas' into 'develop' 

Possible solution to avoid issues with JS and apostrophe of other languages strings

See merge request artica/pandorafms!2932
This commit is contained in:
Alejandro Fraguas 2019-12-13 10:50:37 +01:00
parent 37c5acf4d1 81dcf4713f
commit 810ad03c65
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_io.php
View File

@ -455,7 +455,7 @@ function __($string /*, variable arguments */)
return $string;
}
return $l10n->translate($string);
return str_replace('\'', '`', $l10n->translate($string));
}
$args = func_get_args();
@ -465,7 +465,7 @@ function __($string /*, variable arguments */)
return vsprintf($string, $args);
}
return vsprintf($l10n->translate($string), $args);
return vsprintf(str_replace('\'', '`', $l10n->translate($string)), $args);
}

10
pandora_console/include/languages/ar.po
View File

@ -20268,7 +20268,7 @@ msgid ""
"The alert would fire when the value matches <span id=\"value\"></span>"
msgstr ""
"سيتم إطلاق التنبيه عندما تتطابق القيمة مع ما يلي <span id=\\\"value\\"
"\"></span"
"\"></span>"
#: ../../include/functions_ui.php:1003 ../../godmode/alerts/alert_view.php:147
msgid ""
@ -20284,9 +20284,7 @@ msgid ""
"The alert would fire when the value is between <span id=\"min\"></span> and "
"<span id=\"max\"></span>"
msgstr ""
"سيتم إطلاق التنبيه عندما تكون القيمة بين <span id=\\\"min\\\"></span> and "
"\"\r\n"
"\"<span id=\\\"max\\\"></span>"
"سيتم إطلاق التنبيه عندما تكون القيمة بين <span id=\\\"min\\\"></span> and <span id=\\\"max\\\"></span>"
#: ../../include/functions_ui.php:1012
#: ../../godmode/alerts/configure_alert_template.php:808
@ -20295,9 +20293,7 @@ msgid ""
"The alert would fire when the value is not between <span id=\"min\"></span> "
"and <span id=\"max\"></span>"
msgstr ""
"\" سيتم إطلاق التنبيه عندما لا تكون القيمة بين <span id=\\\"min\\\"></span> "
"\" \r\n"
"\"and <span id=\\\"max\\\"></span>"
"سيتم إطلاق التنبيه عندما لا تكون القيمة بين <span id=\\\"min\\\"></span> and <span id=\\\"max\\\"></span>"
#: ../../include/functions_ui.php:1016
msgid "The alert would fire when the value is over <span id=\"max\"></span>"