Commit 2ce5e652 by SergeiKutanov

code style fixed

parent 08cf7e7b
...@@ -175,7 +175,6 @@ class MessageController extends Controller ...@@ -175,7 +175,6 @@ class MessageController extends Controller
$translated = file_get_contents($fileName); $translated = file_get_contents($fileName);
preg_match_all('/(?<=msgid ").*(?="\nmsgstr)/', $translated, $keys); preg_match_all('/(?<=msgid ").*(?="\nmsgstr)/', $translated, $keys);
preg_match_all('/(?<=msgstr ").*(?="\n\n)/', $translated, $values); preg_match_all('/(?<=msgstr ").*(?="\n\n)/', $translated, $values);
$translated = array_combine($keys[0], $values[0]); $translated = array_combine($keys[0], $values[0]);
} else { } else {
$translated = require($fileName); $translated = require($fileName);
...@@ -189,7 +188,7 @@ class MessageController extends Controller ...@@ -189,7 +188,7 @@ class MessageController extends Controller
$merged = []; $merged = [];
$untranslated = []; $untranslated = [];
foreach ($messages as $message) { foreach ($messages as $message) {
$message = preg_replace('/\\"/', '\"', $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 {
...@@ -203,17 +202,17 @@ class MessageController extends Controller ...@@ -203,17 +202,17 @@ class MessageController extends Controller
$todo[$message] = ''; $todo[$message] = '';
} }
ksort($translated); ksort($translated);
if($format === 'php'){ if($format === 'php'){
foreach ($translated as $message => $translation) { foreach ($translated as $message => $translation) {
if (!isset($merged[$message]) && !isset($todo[$message]) && !$removeUnused) { if (!isset($merged[$message]) && !isset($todo[$message]) && !$removeUnused) {
if (substr($translation, 0, 2) === '@@' && substr($translation, -2) === '@@') { if (substr($translation, 0, 2) === '@@' && substr($translation, -2) === '@@') {
$todo[$message] = $translation; $todo[$message] = $translation;
} else { } else {
$todo[$message] = '@@' . $translation . '@@'; $todo[$message] = '@@' . $translation . '@@';
} }
} }
} }
} }
$merged = array_merge($todo, $merged); $merged = array_merge($todo, $merged);
if ($sort) { if ($sort) {
ksort($merged); ksort($merged);
...@@ -224,8 +223,8 @@ class MessageController extends Controller ...@@ -224,8 +223,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); $k = preg_replace('/(\")|(\\\")/', "\\\"", $k);
$v = preg_replace('/(\")|(\\\")/', "\\\"", $v); $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";
...@@ -238,7 +237,7 @@ class MessageController extends Controller ...@@ -238,7 +237,7 @@ class MessageController extends Controller
$merged = ''; $merged = '';
sort($messages); sort($messages);
foreach($messages as $message) { foreach($messages as $message) {
$message = preg_replace('/(\")|(\\\")/', '\\\"', $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