Skip to content

Y
yii2
Commit 08cf7e7b by SergeiKutanov
Options

po filles generation.

All the quotation marks must be screened by adding a backslash before them. Otherwise we cannot generate .mo file.
parent e09b016a
Showing with 15 additions and 9 deletions
framework/console/controllers/MessageController.php
...@@ -189,6 +189,7 @@ class MessageController extends Controller ...@@ -189,6 +189,7 @@ class MessageController extends Controller
$merged = []; $merged = [];
$untranslated = []; $untranslated = [];
foreach ($messages as $message) { foreach ($messages as $message) {
$message = preg_replace('/\\"/', '\"', $message);
if (array_key_exists($message, $translated) && strlen($translated[$message]) > 0) { if (array_key_exists($message, $translated) && strlen($translated[$message]) > 0) {
$merged[$message] = $translated[$message]; $merged[$message] = $translated[$message];
} else { } else {
...@@ -202,15 +203,17 @@ class MessageController extends Controller ...@@ -202,15 +203,17 @@ class MessageController extends Controller
$todo[$message] = ''; $todo[$message] = '';
} }
ksort($translated); ksort($translated);
foreach ($translated as $message => $translation) { if($format === 'php'){
if (!isset($merged[$message]) && !isset($todo[$message]) && !$removeUnused) { foreach ($translated as $message => $translation) {
if (substr($translation, 0, 2) === '@@' && substr($translation, -2) === '@@') { if (!isset($merged[$message]) && !isset($todo[$message]) && !$removeUnused) {
$todo[$message] = $translation; if (substr($translation, 0, 2) === '@@' && substr($translation, -2) === '@@') {
} else { $todo[$message] = $translation;
$todo[$message] = '@@' . $translation . '@@'; } else {
} $todo[$message] = '@@' . $translation . '@@';
} }
} }
}
}
$merged = array_merge($todo, $merged); $merged = array_merge($todo, $merged);
if ($sort) { if ($sort) {
ksort($merged); ksort($merged);
...@@ -221,6 +224,8 @@ class MessageController extends Controller ...@@ -221,6 +224,8 @@ class MessageController extends Controller
if($format === 'po'){ if($format === 'po'){
$out_str = ''; $out_str = '';
foreach($merged as $k=>$v){ foreach($merged as $k=>$v){
$k = preg_replace('/(\")|(\\\")/', "\\\"", $k);
$v = preg_replace('/(\")|(\\\")/', "\\\"", $v);
$out_str .= "msgid \"$k\"\n"; $out_str .= "msgid \"$k\"\n";
$out_str .= "msgstr \"$v\"\n"; $out_str .= "msgstr \"$v\"\n";
$out_str .= "\n"; $out_str .= "\n";
...@@ -233,6 +238,7 @@ class MessageController extends Controller ...@@ -233,6 +238,7 @@ class MessageController extends Controller
$merged = ''; $merged = '';
sort($messages); sort($messages);
foreach($messages as $message) { foreach($messages as $message) {
$message = preg_replace('/(\")|(\\\")/', '\\\"', $message);
$merged .= "msgid \"$message\"\n"; $merged .= "msgid \"$message\"\n";
$merged .= "msgstr \"\"\n"; $merged .= "msgstr \"\"\n";
$merged .= "\n"; $merged .= "\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment