diff options
| author | Pellaeon Lin <nfsmwlin@gmail.com> | 2014-01-30 22:50:20 +0800 |
|---|---|---|
| committer | Pellaeon Lin <nfsmwlin@gmail.com> | 2014-01-30 22:50:20 +0800 |
| commit | 099b71c712c38de7dac7e386252da02bb0cadf12 (patch) | |
| tree | 84bcf83efdc4cc759a5ff184fa5148195abaab51 /lib/private/l10n.php | |
| parent | 929c930b0afd682bb98eb389d7ebad91bb34d643 (diff) | |
| parent | 299a8285bd2601ccbac988b2e3e9b067d47921a2 (diff) | |
| download | nextcloud-server-099b71c712c38de7dac7e386252da02bb0cadf12.tar.gz nextcloud-server-099b71c712c38de7dac7e386252da02bb0cadf12.zip | |
Merge branch 'master' into pr-exceed_upload_limit_msg
Conflicts:
apps/files/templates/index.php
apps/files_sharing/templates/public.php
Diffstat (limited to 'lib/private/l10n.php')
| -rw-r--r-- | lib/private/l10n.php | 2 |
1 files changed, 1 insertions, 1 deletions
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 ); } |