From fbc85eb964c69407ef8bbff579e1f278b05fdb6d Mon Sep 17 00:00:00 2001 From: Priit Hansen Date: Mon, 21 Jan 2013 16:00:33 +0200 Subject: [PATCH] Fixed untranslated string and updated translations --- code/model/Translatable.php | 4 ++-- lang/en.yml | 1 + lang/et_EE.yml | 26 ++++++++++++++------------ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/code/model/Translatable.php b/code/model/Translatable.php index 4ebb4ec..3764ee1 100755 --- a/code/model/Translatable.php +++ b/code/model/Translatable.php @@ -1,4 +1,4 @@ -setValue($this->original->$fieldname); $nonEditableField->setName($fieldname.'_original'); $nonEditableField->addExtraClass('originallang'); - $nonEditableField->setTitle('Original '.$originalField->Title()); + $nonEditableField->setTitle(_t('Translatable.ORIGINAL', 'Original').' '.$originalField->Title()); $nonEditableField_holder->insertBefore($originalField, $fieldname.'_original'); return $nonEditableField_holder; diff --git a/lang/en.yml b/lang/en.yml index c72fd6f..a7da90a 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -13,6 +13,7 @@ en: EXISTING: 'Existing translations' NEWLANGUAGE: 'New language' NOTICENEWPAGE: 'Please save this page before creating a translation' + ORIGINAL: Original TRANSLATEALLPERMISSION: 'Translate into all available languages' TRANSLATEPERMISSION: 'Translate %s' TRANSLATIONS: Translations diff --git a/lang/et_EE.yml b/lang/et_EE.yml index 0e5c916..08f23a3 100644 --- a/lang/et_EE.yml +++ b/lang/et_EE.yml @@ -1,18 +1,20 @@ et_EE: CMSMain: - LANGUAGEDROPDOWNLABEL: "Keel" + LANGUAGEDROPDOWNLABEL: Keel CMSMain_left.ss: - GO: "Mine" + GO: Mine Form: - LANGAVAIL: "Saadaolevad keeled" - LANGAOTHER: "Muud keeled" + LANGAOTHER: 'Muud keeled' + LANGAVAIL: 'Saadaolevad keeled' Translatable: - TRANSLATIONS: "Tõlked" - CREATE: "Loo uus tõlge" - NEWLANGUAGE: "Uus keel" - CREATEBUTTON: "Loo" - EXISTING: "Olemasolevad tõlked:" - NOTICENEWPAGE: "Enne tõlke loomist salvestage see leht" - TRANSLATEPERMISSION: "Tõlgi: %s" - TRANSLATEALLPERMISSION: "Tõlgi kõigisse saadaolevatesse keeltesse" ALLCREATED: 'Kõik lubatud tõlked on loodud.' + CREATE: 'Loo uus tõlge' + CREATEBUTTON: Loo + EXISTING: 'Olemasolevad tõlked' + NEWLANGUAGE: 'Uus keel' + NOTICENEWPAGE: 'Enne tõlke loomist salvestage see leht' + ORIGINAL: Originaal + TRANSLATEALLPERMISSION: 'Tõlgi kõigisse saadaolevatesse keeltesse' + TRANSLATEPERMISSION: 'Tõlgi: %s' + TRANSLATIONS: Tõlked +