作者 lyh

gx

@@ -77,28 +77,33 @@ class TranslateLogic extends BaseLogic @@ -77,28 +77,33 @@ class TranslateLogic extends BaseLogic
77 if($val == ' ' || $val == ''){ 77 if($val == ' ' || $val == ''){
78 continue; 78 continue;
79 } 79 }
80 - $val = trim(trim($val,' '));  
81 - if (FALSE == in_array(trim(urldecode($val),' '), $old_key)){ 80 + $val = trim(str_replace(' ','',$val));
  81 + if (FALSE == in_array($val, $old_key)){
  82 + $arr2[] = $val;
  83 + }
  84 + }
  85 + foreach ($text_array as $val) {
  86 + if($val == ' ' || $val == ''){
  87 + continue;
  88 + }
  89 + $val = trim(str_replace(' ','',$val));
  90 + if (FALSE == in_array($val, $old_key)){
82 $arr2[] = $val; 91 $arr2[] = $val;
83 } 92 }
84 } 93 }
85 if(!empty($arr2)){ 94 if(!empty($arr2)){
  95 + $i = 0;
  96 + TranslateText:
86 if($languageInfo['short'] == 'zh-ct'){ 97 if($languageInfo['short'] == 'zh-ct'){
87 $languageInfo['short'] = 'zh-TW'; 98 $languageInfo['short'] = 'zh-TW';
88 } 99 }
89 $translate_list = Translate::tran($arr2, $languageInfo['short']); 100 $translate_list = Translate::tran($arr2, $languageInfo['short']);
90 if(empty($translate_list)){ 101 if(empty($translate_list)){
91 - $translate_list = [];  
92 - foreach ($arr2 as $values){  
93 - $transData = Translate::tran($values, $languageInfo['short']);  
94 - if(empty($transData)){  
95 - $transData = $values;  
96 - }  
97 - $translate_list[] = $transData;  
98 - }  
99 - if(empty($translate_list)){  
100 - $this->fail('翻译失败,请稍后重试!'); 102 + if ($i < 3) {
  103 + $i++;
  104 + goto TranslateText;
101 } 105 }
  106 + $this->fail('翻译失败,请稍后重试!');
102 } 107 }
103 if(count($arr2) == 1){ 108 if(count($arr2) == 1){
104 $data[] = [ 109 $data[] = [