From 82419788d314ad698613a4f3748058beea065cb8 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Wed, 8 Jun 2011 20:55:21 -0700
Subject: [PATCH] =?UTF-8?q?Issue=20#504506=20by=20andypost,=20G=C3=A1bor?=
=?UTF-8?q?=20Hojtsy:=20Fixed=20Drupal.formatPlural=20incorrectly=20handle?=
=?UTF-8?q?=20complex=20plural=20rules.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
includes/locale.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/locale.inc b/includes/locale.inc
index 0ca9944f51bf..3fb4707d2553 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -1863,7 +1863,7 @@ function _locale_rebuild_js($langcode = NULL) {
// Construct the array for JavaScript translations.
// Only add strings with a translation to the translations array.
- $result = db_query("SELECT s.lid, s.source, t.translation FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid AND t.language = :language WHERE s.location LIKE '%.js%' AND s.textgroup = :textgroup AND t.translation IS NOT NULL", array(':language' => $language->language, ':textgroup' => 'default'));
+ $result = db_query("SELECT s.lid, s.source, t.translation FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid AND t.language = :language WHERE s.location LIKE '%.js%' AND s.textgroup = :textgroup", array(':language' => $language->language, ':textgroup' => 'default'));
$translations = array();
foreach ($result as $data) {
--
GitLab