[Pkg-owncloud-commits] [owncloud] 02/08: fix plural translation - fixes #6226

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 2417c8a49e5ad93b04632dd61d57fbf5c797ad70
Author: Morris Jobke <morris.jobke at gmail.com>
Date:   Sat Dec 7 11:38:01 2013 +0100

    fix plural translation - fixes #6226
---
 core/js/js.js        | 2 +-
 lib/private/l10n.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index f5991cf..d9b3b54 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -115,7 +115,7 @@ t.cache = {};
  */
 function n(app, text_singular, text_plural, count, vars) {
 	initL10N(app);
-	var identifier = '_' + text_singular + '__' + text_plural + '_';
+	var identifier = '_' + text_singular + '_::_' + text_plural + '_';
 	if( typeof( t.cache[app][identifier] ) !== 'undefined' ){
 		var translation = t.cache[app][identifier];
 		if ($.isArray(translation)) {
diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 2d44085..98665c8 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -262,7 +262,7 @@ class OC_L10N implements \OCP\IL10N {
 	 */
 	public function n($text_singular, $text_plural, $count, $parameters = array()) {
 		$this->init();
-		$identifier = "_${text_singular}__${text_plural}_";
+		$identifier = "_${text_singular}_::_${text_plural}_";
 		if( array_key_exists($identifier, $this->translations)) {
 			return new OC_L10N_String( $this, $identifier, $parameters, $count );
 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git