Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
This commit is contained in:
commit
b9fd853c94
1 changed files with 2 additions and 0 deletions
|
|
@ -682,6 +682,7 @@ class Translate
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
$str = preg_replace('/([^%])%([^%0sdmYIMpHSBb])/', '\1__percent_with_bad_specifier__\2', $str);
|
||||
|
||||
if (strpos($key, 'Format') !== 0) {
|
||||
|
|
@ -695,6 +696,7 @@ class Translate
|
|||
|
||||
$str = str_replace('__percent_with_bad_specifier__', '%', $str);
|
||||
|
||||
|
||||
// We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because
|
||||
// we want to keep '"' '<b>' '</b>' '<u>' '</u>' '<i>' '</i>' '<center> '</center>' '<strong' '</strong>' '<a ' '</a>' '<br>' '<span' '</span>' '< ' that are reliable HTML tags inside translation strings.
|
||||
$str = str_replace(
|
||||
|
|
|
|||
Loading…
Reference in a new issue