Skip to content

Add space for pinyin translation #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 14, 2020
Merged

Add space for pinyin translation #235

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eaf3267
Add space for pinyin translation
taooceros Dec 8, 2020
aaa9381
Manually add sapce to only the cinese character and the surrounding.
taooceros Dec 11, 2020
d64b4b5
Change the way getting acronym
taooceros Dec 11, 2020
64d67c1
Update PinyinAlphabet.cs
taooceros Dec 12, 2020
4c773db
clean up, no code changes
jjw24 Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 34 additions & 14 deletions Flow.Launcher.Infrastructure/PinyinAlphabet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using JetBrains.Annotations;
using Flow.Launcher.Infrastructure.Logger;
using Flow.Launcher.Infrastructure.Storage;
using Flow.Launcher.Infrastructure.UserSettings;
using ToolGood.Words.Pinyin;
using System.Threading.Tasks;

namespace Flow.Launcher.Infrastructure
{
Expand All @@ -27,7 +23,6 @@ public void Initialize([NotNull] Settings settings)
_settings = settings ?? throw new ArgumentNullException(nameof(settings));
}


public string Translate(string content)
{
if (_settings.ShouldUsePinyin)
Expand All @@ -36,10 +31,40 @@ public string Translate(string content)
{
if (WordsHelper.HasChinese(content))
{
var result = WordsHelper.GetPinyin(content, ";");
result = GetFirstPinyinChar(result) + result.Replace(";", "");
_pinyinCache[content] = result;
return result;
var resultList = WordsHelper.GetPinyinList(content);

StringBuilder resultBuilder = new StringBuilder();

for (int i = 0; i < resultList.Length; i++)
{
if (content[i] >= 0x3400 && content[i] <= 0x9FD5)
resultBuilder.Append(resultList[i].First());
}

resultBuilder.Append(' ');

bool pre = false;

for (int i = 0; i < resultList.Length; i++)
{
if (content[i] >= 0x3400 && content[i] <= 0x9FD5)
{
resultBuilder.Append(' ');
resultBuilder.Append(resultList[i]);
pre = true;
}
else
{
if (pre)
{
pre = false;
resultBuilder.Append(' ');
}
resultBuilder.Append(resultList[i]);
}
}

return _pinyinCache[content] = resultBuilder.ToString();
}
else
{
Expand All @@ -56,10 +81,5 @@ public string Translate(string content)
return content;
}
}

private string GetFirstPinyinChar(string content)
{
return string.Concat(content.Split(';').Select(x => x.First()));
}
}
}