fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 10162 Can not use poedit-1.5.4 to translate SOLVED

Browse Source 
- Only "X-Poedit-Language" header was accepted
- Now accepts the header "X-Poedit-Language" and "Language"
This commit is contained in:
Julio Cesar Laura
2012-12-07 17:01:37 -04:00
parent 5152adaca7
commit cf24c78f5d
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gulliver/system/class.i18n_po.php
View File

@@ -264,8 +264,17 @@ class i18n_PO
//verifying the headers data //verifying the headers data
if (! isset( $this->_meta['X-Poedit-Language'] )) { if (! isset( $this->_meta['X-Poedit-Language'] )) {
$this->flagError = true; if (! isset( $this->_meta['Language'] )) {
$errMsg = "X-Poedit-Language meta doesn't exist"; $this->flagError = true;
$errMsg = "X-Poedit-Language and Language meta doesn't exist";
} else if ($this->_meta['Language'] == '') {
$this->flagError = true;
$errMsg = "Language meta is empty";
} else {
$this->_meta['X-Poedit-Language'] = $this->_meta['Language'];
unset($this->_meta['Language']);
$this->flagError = false;
}
} else if ($this->_meta['X-Poedit-Language'] == '') { } else if ($this->_meta['X-Poedit-Language'] == '') {
$this->flagError = true; $this->flagError = true;
$errMsg = "X-Poedit-Language meta is empty"; $errMsg = "X-Poedit-Language meta is empty";

2
workflow/engine/classes/model/Language.php
View File

@@ -233,7 +233,7 @@ class Language extends BaseLanguage
if (count( $match ) < 4) { if (count( $match ) < 4) {
$near = isset( $rowTranslation['msgid'] ) ? $rowTranslation['msgid'] : (isset( $rowTranslation['msgstr'] ) ? $rowTranslation['msgstr'] : ''); $near = isset( $rowTranslation['msgid'] ) ? $rowTranslation['msgid'] : (isset( $rowTranslation['msgstr'] ) ? $rowTranslation['msgstr'] : '');
$errorMsg .= "Invalid Translation reference: \"$reference\", near -> " . $near . "\n"; $errorMsg .= "Invalid Translation reference: \"$reference\", near -> " . strip_tags($near) . "\n";
continue; continue;
} }