diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-12-07 11:38:01 +0100 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-12-07 11:38:01 +0100 |
| commit | 4c4c9096c4e3653ddd44aa299d34367e243dd257 (patch) | |
| tree | f82b03ce3b4545533621672b912d5236ef9aad45 | |
| parent | 6a747106db7d3c35d461f0b4cb3e9c48feea7780 (diff) | |
| download | nextcloud-server-4c4c9096c4e3653ddd44aa299d34367e243dd257.tar.gz nextcloud-server-4c4c9096c4e3653ddd44aa299d34367e243dd257.zip | |
fix plural translation - fixes #6226
| -rw-r--r-- | core/js/js.js | 2 | ||||
| -rw-r--r-- | 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 f5991cfc9dd..d9b3b54e0a1 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 2d440850459..98665c84c55 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 ); } |