Skip to content

Commit 92ced0f

Browse files
committed
prepare to support bing translation api
1 parent 0e1b3ed commit 92ced0f

10 files changed

Lines changed: 81 additions & 73 deletions

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ to<br>
1313

1414
####Warning
1515
* Currently, Android Localizationer only support translate **English** to other languages
16-
* The result may **not** be meet your standards due to the Translation API that this plugin is using.
16+
* The result may **not** be meet your standards due to the Translation API that this plugin is using, so keep your string resources **as simple as possible**
1717

1818
More features are coming, please check [Todo](https://github.com/westlinkin/AndroidLocalizationer#todo).
1919

2020

2121
##Downloads
2222

23-
##Change Notes
23+
##ChangeLog
2424

2525
##Todo
2626
* Multiple translation engine

‎src/action/ConvertToOtherLanguages.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.intellij.openapi.vfs.VirtualFile;
2626
import data.StorageDataKey;
2727
import data.task.GetTranslationTask;
28+
import language_engine.TranslationEngineType;
2829
import module.AndroidString;
2930
import module.SupportedLanguages;
3031
import ui.MultiSelectDialog;
@@ -46,6 +47,8 @@ public class ConvertToOtherLanguages extends AnAction implements MultiSelectDial
4647
private Project project;
4748
private List<AndroidString> androidStringsInStringFile = null;
4849

50+
public TranslationEngineType defaultTranslationEngine = TranslationEngineType.Bing;
51+
4952
public void actionPerformed(AnActionEvent e) {
5053

5154
project = e.getProject();
@@ -59,6 +62,7 @@ public void actionPerformed(AnActionEvent e) {
5962
return;
6063
}
6164

65+
// todo: read settings, write @defaultTranslationEngine
6266

6367
try {
6468
androidStringsInStringFile = AndroidString.getAndroidStringsList(clickedFile.contentsToByteArray());
@@ -77,6 +81,7 @@ public void actionPerformed(AnActionEvent e) {
7781
null,
7882
OVERRIDE_EXITS_STRINGS,
7983
PropertiesComponent.getInstance(project).getBoolean(StorageDataKey.OverrideCheckBoxStatus, false),
84+
defaultTranslationEngine,
8085
false);
8186
multiSelectDialog.setOnOKClickedListener(this);
8287
multiSelectDialog.show();
@@ -88,7 +93,7 @@ public void onClick(List<SupportedLanguages> selectedLanguages, boolean override
8893
PropertiesComponent propertiesComponent = PropertiesComponent.getInstance(project);
8994
propertiesComponent.setValue(StorageDataKey.OverrideCheckBoxStatus, String.valueOf(overrideChecked));
9095

91-
List<SupportedLanguages> allData = SupportedLanguages.getAllSupportedLanguages();
96+
List<SupportedLanguages> allData = SupportedLanguages.getAllSupportedLanguages(defaultTranslationEngine);
9297

9398
for (SupportedLanguages language : allData) {
9499
propertiesComponent.setValue(StorageDataKey.SupportedLanguageCheckStatusPrefix + language.getLanguageCode(),

‎src/data/Key.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,16 @@
2020
* Created by Wesley Lin on 11/29/14.
2121
*/
2222
public class Key {
23+
// google
2324
public static final String GOOGLE_TRANSLATION_API_KEY = "AIzaSyDRSQOo27pYdt7rkluYsNO_wvwi8bg4gvk";
2425

26+
// bing, clientId and clientSecret can be set by users
27+
public static final String BING_CLIENT_ID = "android_localizationer";
28+
public static final String BING_CLIENT_SECRET = "eQiD1XOQCKToGLWMl0GXuWZb2cQJqYIwid8UPhln5CY=";
29+
public static final String BING_CLIENT_SCOPE = "http://api.microsofttranslator.com";
30+
public static final String BING_CLIENT_GRANT_TYPE = "client_credentials";
31+
32+
33+
// other than api keys
2534
public static final String NO_NEED_TRANSLATION_ANDROID_STRING_PREFIX = "NAL_";
2635
}

‎src/data/task/GetTranslationTask.java‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import com.intellij.openapi.progress.ProgressIndicator;
2020
import com.intellij.openapi.progress.Task;
2121
import com.intellij.openapi.project.Project;
22-
import language_engine.google.GoogleTranslationApi;
22+
import language_engine.TranslationEngineType;
2323
import module.AndroidString;
2424
import module.SupportedLanguages;
25-
import language_engine.google.GoogleTranslationJSON;
25+
import org.jetbrains.annotations.NotNull;
2626

2727
import java.util.List;
2828

@@ -34,29 +34,50 @@ public class GetTranslationTask extends Task.Backgroundable{
3434
private List<SupportedLanguages> selectedLanguages;
3535
private List<AndroidString> androidStrings;
3636
private double indicatorFractionFrame;
37+
private TranslationEngineType translationEngineType;
3738

38-
public GetTranslationTask(Project project, String title,
39-
List<SupportedLanguages> selectedLanguages, List<AndroidString> androidStrings) {
39+
public GetTranslationTask(Project project, String title, List<SupportedLanguages> selectedLanguages,
40+
List<AndroidString> androidStrings, TranslationEngineType translationEngineType) {
4041
super(project, title);
4142
this.selectedLanguages = selectedLanguages;
4243
this.androidStrings = androidStrings;
44+
this.translationEngineType = translationEngineType;
4345
this.indicatorFractionFrame = 1.0d / (double)(this.selectedLanguages.size());
4446
}
4547

4648
@Override
4749
public void run(ProgressIndicator indicator) {
48-
// todo: get choosed language engine
49-
5050
for (int i = 0; i < selectedLanguages.size(); i++) {
5151
SupportedLanguages language = selectedLanguages.get(i);
52-
GoogleTranslationJSON json = GoogleTranslationApi.getTranslationJSON(AndroidString.getAndroidStringValues(androidStrings),
53-
language, SupportedLanguages.English);
52+
List<AndroidString> translationResult = getTranslationEngineResult(
53+
AndroidString.getAndroidStringValues(androidStrings),
54+
language,
55+
SupportedLanguages.English,
56+
translationEngineType
57+
);
5458
indicator.setFraction(indicatorFractionFrame * (double)(i));
55-
indicator.setText("Translating to " + language.name() + " (" + language.getLanguageDisplayName() + ")");
59+
indicator.setText("Translating to " + language.getLanguageEnglishDisplayName()
60+
+ " (" + language.getLanguageDisplayName() + ")");
5661

5762
// todo: write to file
63+
5864
}
5965
}
6066

67+
private List<AndroidString> getTranslationEngineResult(@NotNull List<String> querys,
68+
@NotNull SupportedLanguages targetLanguageCode,
69+
@NotNull SupportedLanguages sourceLanguageCode,
70+
TranslationEngineType translationEngineType) {
71+
// todo
72+
switch (translationEngineType) {
73+
case Bing:
74+
75+
// return XXX
76+
break;
77+
case Google:
78+
break;
79+
}
80+
return null;
81+
}
6182

6283
}

src/language_engine/google/GoogleTranslations.java renamed to src/language_engine/TranslationEngineType.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
package language_engine.google;
17+
package language_engine;
1818

1919
/**
20-
* Created by Wesley Lin on 12/1/14.
20+
* Created by Wesley Lin on 12/2/14.
2121
*/
22-
public class GoogleTranslations {
23-
public String translatedText;
22+
public enum TranslationEngineType {
23+
Bing,
24+
Google
2425
}

‎src/language_engine/google/GoogleTranslationApi.java‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package language_engine.google;
1818

19-
import com.google.gson.Gson;
2019
import data.Key;
2120
import language_engine.HttpUtils;
2221
import module.SupportedLanguages;
@@ -31,9 +30,17 @@
3130
* Created by Wesley Lin on 12/1/14.
3231
*/
3332
public class GoogleTranslationApi {
34-
public static final String BASE_TRANSLATION_URL = "https://www.googleapis.com/language/translate/v2?%s&target=%s&source=%s&key=%s";
33+
private static final String BASE_TRANSLATION_URL = "https://www.googleapis.com/language/translate/v2?%s&target=%s&source=%s&key=%s";
3534

36-
public static GoogleTranslationJSON getTranslationJSON(@NotNull List<String> querys,
35+
/**
36+
* not ready for now
37+
* @param querys
38+
* @param targetLanguageCode
39+
* @param sourceLanguageCode
40+
* @return
41+
*/
42+
@Deprecated
43+
public static String getTranslationJSON(@NotNull List<String> querys,
3744
@NotNull SupportedLanguages targetLanguageCode,
3845
@NotNull SupportedLanguages sourceLanguageCode) {
3946
if (querys.isEmpty())
@@ -61,7 +68,7 @@ public static GoogleTranslationJSON getTranslationJSON(@NotNull List<String> que
6168
System.out.println("url: " + url);
6269
String result = HttpUtils.doHttpGet(url);
6370
System.out.println("do get result: " + result);
64-
return new Gson().fromJson(result, GoogleTranslationJSON.class);
71+
return result;
6572
}
6673

6774
}

‎src/language_engine/google/GoogleTranslationData.java‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/language_engine/google/GoogleTranslationJSON.java‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/module/SupportedLanguages.java‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package module;
1818

19+
import language_engine.TranslationEngineType;
20+
1921
import java.util.ArrayList;
2022
import java.util.EnumSet;
2123
import java.util.List;
@@ -92,10 +94,12 @@ public enum SupportedLanguages {
9294

9395
private String languageCode;
9496
private String languageDisplayName;
97+
private String languageEnglishDisplayName;
9598

96-
SupportedLanguages(String languageCode, String languageDisplayName) {
99+
SupportedLanguages(String languageCode, String languageDisplayName, String languageEnglishDisplayName) {
97100
this.languageCode = languageCode;
98101
this.languageDisplayName = languageDisplayName;
102+
this.languageEnglishDisplayName = languageEnglishDisplayName;
99103
}
100104

101105
public String getLanguageCode() {
@@ -106,7 +110,12 @@ public String getLanguageDisplayName() {
106110
return languageDisplayName;
107111
}
108112

109-
public static List<SupportedLanguages> getAllSupportedLanguages() {
113+
public String getLanguageEnglishDisplayName() {
114+
return languageEnglishDisplayName;
115+
}
116+
117+
// todo: add a parameter(@TranslationEngineType) to get supportedLanguages for certain api
118+
public static List<SupportedLanguages> getAllSupportedLanguages(TranslationEngineType type) {
110119
EnumSet<SupportedLanguages> all = EnumSet.allOf(SupportedLanguages.class);
111120
List<SupportedLanguages> data = new ArrayList<SupportedLanguages>(all.size());
112121
for (SupportedLanguages languages : all) {
@@ -116,6 +125,6 @@ public static List<SupportedLanguages> getAllSupportedLanguages() {
116125
}
117126

118127
public String toString() {
119-
return name() + "(\"" + getLanguageCode() + "\", \"" + getLanguageDisplayName() + "\")";
128+
return getLanguageEnglishDisplayName() + "(\"" + getLanguageCode() + "\", \"" + getLanguageDisplayName() + "\")";
120129
}
121130
}

‎src/ui/MultiSelectDialog.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.intellij.util.Alarm;
3232
import com.intellij.util.ui.UIUtil;
3333
import data.StorageDataKey;
34+
import language_engine.TranslationEngineType;
3435
import module.SupportedLanguages;
3536
import org.jetbrains.annotations.NotNull;
3637
import org.jetbrains.annotations.Nullable;
@@ -67,7 +68,7 @@ public interface OnOKClickedListener {
6768
private String myCheckboxText;
6869
private boolean myChecked;
6970

70-
private java.util.List<SupportedLanguages> data = SupportedLanguages.getAllSupportedLanguages();
71+
private java.util.List<SupportedLanguages> data;
7172
private java.util.List<SupportedLanguages> selectedLanguages = new ArrayList<SupportedLanguages>();
7273
private OnOKClickedListener onOKClickedListener;
7374

@@ -81,8 +82,10 @@ public MultiSelectDialog(@Nullable Project project,
8182
@Nullable Icon icon,
8283
@Nullable String checkboxText,
8384
boolean checkboxStatus,
85+
TranslationEngineType translationEngineType,
8486
boolean canBeParent) {
8587
super(project, canBeParent);
88+
data = SupportedLanguages.getAllSupportedLanguages(translationEngineType);
8689
_init(project, title, message, icon, checkboxText, checkboxStatus, null);
8790
}
8891

@@ -258,7 +261,8 @@ protected JComponent doCreateCenterPanel() {
258261
int gridRow = (data.size() % gridCol == 0) ? data.size() / gridCol : data.size() / gridCol + 1;
259262
container.setLayout(new GridLayout(gridRow, gridCol));
260263
for (final SupportedLanguages language : data) {
261-
JCheckBox checkbox = new JCheckBox(language.name() + " (" + language.getLanguageDisplayName() + ") ");
264+
JCheckBox checkbox = new JCheckBox(language.getLanguageEnglishDisplayName()
265+
+ " (" + language.getLanguageDisplayName() + ") ");
262266
checkbox.addItemListener(new ItemListener() {
263267
@Override
264268
public void itemStateChanged(ItemEvent e) {

0 commit comments

Comments
 (0)