Skip to content

Commit a2ba994

Browse files
Merge branch 'trunk' into feature/check-iap-eligibility
2 parents d6a0260 + ec4e303 commit a2ba994

File tree

3 files changed

+27
-0
lines changed

3 files changed

+27
-0
lines changed

WooCommerce/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ android {
9898
pickFirst 'META-INF/AL2.0'
9999
pickFirst 'META-INF/LGPL2.1'
100100
}
101+
102+
resConfigs(
103+
"en", "ar", "de", "es", "fr", "he", "id", "in", "it", "iw", "ja", "ko", "nl", "pt-rBR", "ru", "sv", "tr", "zh-rCN", "zh-rTW"
104+
)
101105
}
102106

103107
buildFeatures {

WooCommerce/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
android:roundIcon="@mipmap/ic_launcher_round"
2828
android:supportsRtl="true"
2929
android:theme="@style/Theme.Woo.DayNight"
30+
android:localeConfig="@xml/locales_config"
3031
tools:ignore="UnusedAttribute">
3132

3233
<!-- TODO: we eventually want to drop support for Apache, but for now it's used by FluxC -->
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
3+
<locale android:name="en"/> <!-- English -->
4+
<locale android:name="ar"/> <!-- Arabic -->
5+
<locale android:name="de"/> <!-- German -->
6+
<locale android:name="es"/> <!-- Spanish (Spain) -->
7+
<locale android:name="fr"/> <!-- French (France) -->
8+
<locale android:name="he"/> <!-- Hebrew -->
9+
<locale android:name="id"/> <!-- Indonesian -->
10+
<locale android:name="in"/> <!-- Indonesian -->
11+
<locale android:name="it"/> <!-- Italian -->
12+
<locale android:name="iw"/> <!-- Hebrew -->
13+
<locale android:name="ja"/> <!-- Japanese -->
14+
<locale android:name="ko"/> <!-- Korean -->
15+
<locale android:name="nl"/> <!-- Dutch -->
16+
<locale android:name="pt-BR"/> <!-- Portuguese (Brazil) -->
17+
<locale android:name="ru"/> <!-- Russian -->
18+
<locale android:name="sv"/> <!-- Swedish -->
19+
<locale android:name="tr"/> <!-- Turkish -->
20+
<locale android:name="zh-CN"/> <!-- Chinese (Simplified) -->
21+
<locale android:name="zh-TW"/> <!-- Chinese (Traditional) -->
22+
</locale-config>

0 commit comments

Comments
 (0)