|
9 | 9 | using Flow.Launcher.Infrastructure.UserSettings;
|
10 | 10 | using ToolGood.Words.Pinyin;
|
11 | 11 | using System.Threading.Tasks;
|
| 12 | +using Microsoft.AspNetCore.Localization; |
12 | 13 |
|
13 | 14 | namespace Flow.Launcher.Infrastructure
|
14 | 15 | {
|
@@ -36,10 +37,43 @@ public string Translate(string content)
|
36 | 37 | {
|
37 | 38 | if (WordsHelper.HasChinese(content))
|
38 | 39 | {
|
39 |
| - var result = WordsHelper.GetPinyin(content, " "); |
40 |
| - result = GetFirstPinyinChar(result) + result; |
41 |
| - _pinyinCache[content] = result; |
42 |
| - return result; |
| 40 | + var resultList = WordsHelper.GetPinyinList(content); |
| 41 | + |
| 42 | + List<int> chineseIndexs = new List<int>(); |
| 43 | + |
| 44 | + for (int i = 0; i < content.Length; i++) |
| 45 | + { |
| 46 | + if (resultList[i].Length != 1 || !(resultList[i][0] == content[i])) |
| 47 | + chineseIndexs.Add(i); |
| 48 | + } |
| 49 | + StringBuilder resultBuilder = new StringBuilder(); |
| 50 | + resultBuilder.Append(string.Concat(resultList.Where((r, i) => chineseIndexs.Contains(i)).Select(s => s.First()))); |
| 51 | + resultBuilder.Append(' '); |
| 52 | + |
| 53 | + int currentChineseIndex = 0; |
| 54 | + int lastChineseIndex = -1; |
| 55 | + for (int i = 0; i < resultList.Length; i++) |
| 56 | + { |
| 57 | + if (currentChineseIndex < chineseIndexs.Count && chineseIndexs[currentChineseIndex] == i) |
| 58 | + { |
| 59 | + resultBuilder.Append(' '); |
| 60 | + |
| 61 | + resultBuilder.Append(resultList[i]); |
| 62 | + currentChineseIndex++; |
| 63 | + lastChineseIndex = i; |
| 64 | + } |
| 65 | + else |
| 66 | + { |
| 67 | + if (i == lastChineseIndex + 1) |
| 68 | + { |
| 69 | + resultBuilder.Append(' '); |
| 70 | + } |
| 71 | + resultBuilder.Append(resultList[i]); |
| 72 | + } |
| 73 | + } |
| 74 | + |
| 75 | + |
| 76 | + return _pinyinCache[content] = resultBuilder.ToString(); |
43 | 77 | }
|
44 | 78 | else
|
45 | 79 | {
|
|
0 commit comments