From 06f37b5a53c7dc9b8d79355dcc67c9d378a74cc6 Mon Sep 17 00:00:00 2001 From: Andy Staudacher Date: Thu, 18 Jun 2009 01:42:59 -0700 Subject: Fix/remove unnecessary escaping of double quotes in l10n scanner. --- modules/gallery/helpers/l10n_scanner.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/gallery/helpers/l10n_scanner.php') diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php index 80b6f01c..bae455f2 100644 --- a/modules/gallery/helpers/l10n_scanner.php +++ b/modules/gallery/helpers/l10n_scanner.php @@ -149,6 +149,6 @@ class l10n_scanner_Core { } else { $str = strtr($str, array("\\'" => "'", "\\\\" => "\\")); } - return addcslashes($str, "\0..\37\\\""); + return $str; } } -- cgit v1.2.3 From 926eab7168ee2f8de0a02ebbbe82ae8801a360a0 Mon Sep 17 00:00:00 2001 From: Andy Staudacher Date: Thu, 18 Jun 2009 12:35:07 -0700 Subject: Fix plural messages in l10n scanner - Bad typo lead to basically breaking all plural ("other") forms. --- modules/gallery/helpers/l10n_scanner.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/gallery/helpers/l10n_scanner.php') diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php index bae455f2..a68aa28b 100644 --- a/modules/gallery/helpers/l10n_scanner.php +++ b/modules/gallery/helpers/l10n_scanner.php @@ -125,7 +125,7 @@ class l10n_scanner_Core { && is_array($first_param) && $first_param[0] == T_CONSTANT_ENCAPSED_STRING && is_array($second_param) && $second_param[0] == T_CONSTANT_ENCAPSED_STRING) { $singular = self::_escape_quoted_string($first_param[1]); - $plural = self::_escape_quoted_string($first_param[1]); + $plural = self::_escape_quoted_string($second_param[1]); l10n_scanner::process_message(array("one" => $singular, "other" => $plural), $cache); } else { // t2() found, but inside is something which is not a string literal. -- cgit v1.2.3