Skip to content

Commit

Permalink
fix: 修复翻译项选项复制问题，保证打包与源码一致
Browse files Browse the repository at this point in the history 
1. 用原 alfredworkflow 内容源码覆盖 src 内容
2. 修复中译英时，每项 arg 内容为对应不同项翻译，而非固定第一项翻译
3. 英译中时，固定第一项 arg 为英语原文，可以直接发音
  • Loading branch information
@zthxxx
zthxxx committed Aug 21, 2019
1 parent 84f0d76 commit 890fc00
Show file tree
Hide file tree
Showing 4 changed files with 473 additions and 48 deletions.
Binary file modified YoudaoTranslate.alfredworkflow
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions src/YoudaoTranslate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function translate($query)
*/
private function parseTranslation($translation)
{
$this->addItem($translation[0], null);
$this->addItem($translation[0], null, $this->pronounce);
}

/**
Expand Down Expand Up @@ -257,7 +257,7 @@ private function getLastLines($filename,$n)
*/
private function addItem($title, $subtitle, $arg = null, $toArray = false)
{
$arg = $arg ? $arg : $this->pronounce;
$arg = $arg ? $arg : $title;
$_subtitle = $subtitle ? $subtitle : $this->query;
$_quicklookurl = 'http://youdao.com/w/'.urlencode($this->query);
$_icon = $this->startsWith($arg, '~') ? 'translate-say.png' : 'translate.png';
Expand Down
96 changes: 50 additions & 46 deletions src/info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
<dict>
<key>bundleid</key>
<string>Youdao.Translator</string>
<key>category</key>
<string>Tools</string>
<key>connections</key>
<dict>
<key>1631393E-5B53-4C8B-AF64-A04B687438DF</key>
<array>
<dict>
<key>destinationuid</key>
<string>284F6AAD-8FE7-44A6-AAE4-62A0F8BEE779</string>
<string>6B0F6A32-751F-4071-A1E8-76A2E9486962</string>
<key>modifiers</key>
<integer>0</integer>
<key>modifiersubtext</key>
Expand Down Expand Up @@ -48,6 +46,16 @@
<key>vitoclose</key>
<false/>
</dict>
<dict>
<key>destinationuid</key>
<string>6B0F6A32-751F-4071-A1E8-76A2E9486962</string>
<key>modifiers</key>
<integer>1048576</integer>
<key>modifiersubtext</key>
<string>🔊 {query}</string>
<key>vitoclose</key>
<true/>
</dict>
<dict>
<key>destinationuid</key>
<string>487D7A3C-11A7-416D-8F0F-21097B979E4C</string>
Expand Down Expand Up @@ -132,6 +140,33 @@
<key>version</key>
<integer>1</integer>
</dict>
<dict>
<key>config</key>
<dict>
<key>concurrently</key>
<false/>
<key>escaping</key>
<integer>102</integer>
<key>script</key>
<string>query="{query}"
echo $query
echo -n $query | say $1 -v Samantha</string>
<key>scriptargtype</key>
<integer>0</integer>
<key>scriptfile</key>
<string></string>
<key>type</key>
<integer>0</integer>
</dict>
<key>type</key>
<string>alfred.workflow.action.script</string>
<key>uid</key>
<string>6B0F6A32-751F-4071-A1E8-76A2E9486962</string>
<key>version</key>
<integer>2</integer>
</dict>
<dict>
<key>config</key>
<dict>
Expand All @@ -143,12 +178,6 @@
<false/>
<key>focusedappvariablename</key>
<string></string>
<key>hotkey</key>
<integer>-1</integer>
<key>hotmod</key>
<integer>524288</integer>
<key>hotstring</key>
<string>double tap</string>
<key>leftcursor</key>
<false/>
<key>modsmode</key>
Expand All @@ -175,11 +204,11 @@
<key>keyword</key>
<string>yd</string>
<key>queuedelaycustom</key>
<integer>3</integer>
<integer>1</integer>
<key>queuedelayimmediatelyinitially</key>
<false/>
<key>queuedelaymode</key>
<integer>1</integer>
<integer>2</integer>
<key>queuemode</key>
<integer>2</integer>
<key>runningsubtext</key>
Expand Down Expand Up @@ -218,32 +247,6 @@ echo $translator-&gt;translate($argv[1]);
<key>version</key>
<integer>2</integer>
</dict>
<dict>
<key>config</key>
<dict>
<key>concurrently</key>
<false/>
<key>escaping</key>
<integer>102</integer>
<key>script</key>
<string>cd $TMPDIR
curl -o {query} "https://dict.youdao.com/dictvoice?audio={query}&amp;type=1"
afplay {query}
rm {query}</string>
<key>scriptargtype</key>
<integer>0</integer>
<key>scriptfile</key>
<string></string>
<key>type</key>
<integer>0</integer>
</dict>
<key>type</key>
<string>alfred.workflow.action.script</string>
<key>uid</key>
<string>284F6AAD-8FE7-44A6-AAE4-62A0F8BEE779</string>
<key>version</key>
<integer>2</integer>
</dict>
<dict>
<key>config</key>
<dict>
Expand Down Expand Up @@ -288,9 +291,10 @@ rm {query}</string>
<key>escaping</key>
<integer>102</integer>
<key>script</key>
<string>query="{query}"
echo -n $query | say $1 -v Samantha</string>
<string>cd $TMPDIR
curl -o {query} "https://dict.youdao.com/dictvoice?audio={query}&amp;type=1"
afplay {query}
rm {query}</string>
<key>scriptargtype</key>
<integer>0</integer>
<key>scriptfile</key>
Expand All @@ -301,7 +305,7 @@ echo -n $query | say $1 -v Samantha</string>
<key>type</key>
<string>alfred.workflow.action.script</string>
<key>uid</key>
<string>6B0F6A32-751F-4071-A1E8-76A2E9486962</string>
<string>284F6AAD-8FE7-44A6-AAE4-62A0F8BEE779</string>
<key>version</key>
<integer>2</integer>
</dict>
Expand All @@ -326,12 +330,12 @@ echo -n $query | say $1 -v Samantha</string>
<key>xpos</key>
<integer>740</integer>
<key>ypos</key>
<integer>240</integer>
<integer>350</integer>
</dict>
<key>487D7A3C-11A7-416D-8F0F-21097B979E4C</key>
<dict>
<key>xpos</key>
<integer>540</integer>
<integer>530</integer>
<key>ypos</key>
<integer>270</integer>
</dict>
Expand All @@ -344,7 +348,7 @@ echo -n $query | say $1 -v Samantha</string>
<key>xpos</key>
<integer>740</integer>
<key>ypos</key>
<integer>390</integer>
<integer>170</integer>
</dict>
<key>8FE8475E-6310-49A4-967E-D6CCE73A86AC</key>
<dict>
Expand All @@ -358,14 +362,14 @@ echo -n $query | say $1 -v Samantha</string>
<key>xpos</key>
<integer>540</integer>
<key>ypos</key>
<integer>140</integer>
<integer>70</integer>
</dict>
<key>CAF59F43-6C28-47BF-B3DA-1A65C2198F2F</key>
<dict>
<key>xpos</key>
<integer>740</integer>
<key>ypos</key>
<integer>110</integer>
<integer>40</integer>
</dict>
<key>D7047D97-8226-43FB-8656-4CF365DB3FE3</key>
<dict>
Expand Down
Loading

0 comments on commit 890fc00

Please sign in to comment.