mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 03:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

use SDL style - else on same line as closing brace

Browse Source 
(cherry picked from commit b8e055ce64)
This commit is contained in:
kyle-sylvestre
2025-05-20 19:11:46 -04:00
committed by Sam Lantinga
parent 4d3cdb70b5
commit 9546c54286
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
View File

@@ -2129,8 +2129,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
if (i != 0) result += ","; if (i != 0) result += ",";
result += formatLocale(locales.get(i)); result += formatLocale(locales.get(i));
} }
} } else if (mCurrentLocale != null) {
else if (mCurrentLocale != null) {
result = formatLocale(mCurrentLocale); result = formatLocale(mCurrentLocale);
} }
return result; return result;
@@ -2142,19 +2141,16 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
if (locale.getLanguage() == "in") { if (locale.getLanguage() == "in") {
// Indonesian is "id" according to ISO 639.2, but on Android is "in" because of Java backwards compatibility // Indonesian is "id" according to ISO 639.2, but on Android is "in" because of Java backwards compatibility
lang = "id"; lang = "id";
} } else if (locale.getLanguage() == "") {
else if (locale.getLanguage() == "") {
// Make sure language is never empty // Make sure language is never empty
lang = "und"; lang = "und";
} } else {
else {
lang = locale.getLanguage(); lang = locale.getLanguage();
} }
if (locale.getCountry() == "") { if (locale.getCountry() == "") {
result = lang; result = lang;
} } else {
else {
result = lang + "_" + locale.getCountry(); result = lang + "_" + locale.getCountry();
} }
return result; return result;