BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/314633
Change subject: Hygiene: Rename interlanguage package to language ...................................................................... Hygiene: Rename interlanguage package to language The old name was used in a catachrestic way. Change-Id: I14785354da76f75301bd7ef17787f8e5519ac47c --- M app/src/androidTest/java/org/wikipedia/test/LanguageVariantTests.java M app/src/main/AndroidManifest.xml M app/src/main/java/org/wikipedia/Site.java M app/src/main/java/org/wikipedia/WikipediaApp.java R app/src/main/java/org/wikipedia/language/AcceptLanguageUtil.java R app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java R app/src/main/java/org/wikipedia/language/AppLanguageState.java R app/src/main/java/org/wikipedia/language/LangLinksActivity.java R app/src/main/java/org/wikipedia/language/LangLinksFetchTask.java R app/src/main/java/org/wikipedia/language/LanguageUtil.java M app/src/main/java/org/wikipedia/page/PageActivity.java M app/src/main/java/org/wikipedia/page/PageFragment.java M app/src/main/java/org/wikipedia/settings/LanguagePreferenceDialog.java M app/src/main/java/org/wikipedia/util/L10nUtil.java 14 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/33/314633/1 diff --git a/app/src/androidTest/java/org/wikipedia/test/LanguageVariantTests.java b/app/src/androidTest/java/org/wikipedia/test/LanguageVariantTests.java index 7003b30..4911ef3 100644 --- a/app/src/androidTest/java/org/wikipedia/test/LanguageVariantTests.java +++ b/app/src/androidTest/java/org/wikipedia/test/LanguageVariantTests.java @@ -6,7 +6,7 @@ import org.wikipedia.Site; import org.wikipedia.WikipediaApp; -import org.wikipedia.interlanguage.AppLanguageLookUpTable; +import org.wikipedia.language.AppLanguageLookUpTable; import java.util.Locale; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 09037b6..8c2830c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -112,7 +112,7 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> - <activity android:name=".interlanguage.LangLinksActivity" + <activity android:name=".language.LangLinksActivity" android:label="@string/langlinks_activity_title" android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:exported="false" diff --git a/app/src/main/java/org/wikipedia/Site.java b/app/src/main/java/org/wikipedia/Site.java index a21ccd0..78e4896 100644 --- a/app/src/main/java/org/wikipedia/Site.java +++ b/app/src/main/java/org/wikipedia/Site.java @@ -8,7 +8,7 @@ import com.google.gson.annotations.SerializedName; -import org.wikipedia.interlanguage.AppLanguageLookUpTable; +import org.wikipedia.language.AppLanguageLookUpTable; import org.wikipedia.page.PageTitle; import org.wikipedia.settings.Prefs; import org.wikipedia.util.UriUtil; diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java b/app/src/main/java/org/wikipedia/WikipediaApp.java index a1b46a0..5ca6353 100644 --- a/app/src/main/java/org/wikipedia/WikipediaApp.java +++ b/app/src/main/java/org/wikipedia/WikipediaApp.java @@ -34,8 +34,8 @@ import org.wikipedia.events.ChangeTextSizeEvent; import org.wikipedia.events.ThemeChangeEvent; import org.wikipedia.history.HistoryEntry; -import org.wikipedia.interlanguage.AcceptLanguageUtil; -import org.wikipedia.interlanguage.AppLanguageState; +import org.wikipedia.language.AcceptLanguageUtil; +import org.wikipedia.language.AppLanguageState; import org.wikipedia.login.User; import org.wikipedia.onboarding.OnboardingStateMachine; import org.wikipedia.onboarding.PrefsOnboardingStateMachine; diff --git a/app/src/main/java/org/wikipedia/interlanguage/AcceptLanguageUtil.java b/app/src/main/java/org/wikipedia/language/AcceptLanguageUtil.java similarity index 97% rename from app/src/main/java/org/wikipedia/interlanguage/AcceptLanguageUtil.java rename to app/src/main/java/org/wikipedia/language/AcceptLanguageUtil.java index 446a6ec..664ce37 100644 --- a/app/src/main/java/org/wikipedia/interlanguage/AcceptLanguageUtil.java +++ b/app/src/main/java/org/wikipedia/language/AcceptLanguageUtil.java @@ -1,4 +1,4 @@ -package org.wikipedia.interlanguage; +package org.wikipedia.language; import android.support.annotation.NonNull; diff --git a/app/src/main/java/org/wikipedia/interlanguage/AppLanguageLookUpTable.java b/app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java similarity index 98% rename from app/src/main/java/org/wikipedia/interlanguage/AppLanguageLookUpTable.java rename to app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java index d9144ed..2babe07 100644 --- a/app/src/main/java/org/wikipedia/interlanguage/AppLanguageLookUpTable.java +++ b/app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java @@ -1,4 +1,4 @@ -package org.wikipedia.interlanguage; +package org.wikipedia.language; import android.content.Context; import android.content.res.Resources; diff --git a/app/src/main/java/org/wikipedia/interlanguage/AppLanguageState.java b/app/src/main/java/org/wikipedia/language/AppLanguageState.java similarity index 98% rename from app/src/main/java/org/wikipedia/interlanguage/AppLanguageState.java rename to app/src/main/java/org/wikipedia/language/AppLanguageState.java index 53b4531..dfc4b45 100644 --- a/app/src/main/java/org/wikipedia/interlanguage/AppLanguageState.java +++ b/app/src/main/java/org/wikipedia/language/AppLanguageState.java @@ -1,4 +1,4 @@ -package org.wikipedia.interlanguage; +package org.wikipedia.language; import android.content.Context; import android.support.annotation.NonNull; diff --git a/app/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java b/app/src/main/java/org/wikipedia/language/LangLinksActivity.java similarity index 99% rename from app/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java rename to app/src/main/java/org/wikipedia/language/LangLinksActivity.java index 98d11ae..d7947e2 100644 --- a/app/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java +++ b/app/src/main/java/org/wikipedia/language/LangLinksActivity.java @@ -1,4 +1,4 @@ -package org.wikipedia.interlanguage; +package org.wikipedia.language; import android.content.Intent; import android.os.Bundle; diff --git a/app/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java b/app/src/main/java/org/wikipedia/language/LangLinksFetchTask.java similarity index 97% rename from app/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java rename to app/src/main/java/org/wikipedia/language/LangLinksFetchTask.java index 78b9b4c..45fc0a8 100644 --- a/app/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java +++ b/app/src/main/java/org/wikipedia/language/LangLinksFetchTask.java @@ -1,4 +1,4 @@ -package org.wikipedia.interlanguage; +package org.wikipedia.language; import android.content.Context; import org.json.JSONArray; diff --git a/app/src/main/java/org/wikipedia/interlanguage/LanguageUtil.java b/app/src/main/java/org/wikipedia/language/LanguageUtil.java similarity index 97% rename from app/src/main/java/org/wikipedia/interlanguage/LanguageUtil.java rename to app/src/main/java/org/wikipedia/language/LanguageUtil.java index bdf67c4..10e1fce 100644 --- a/app/src/main/java/org/wikipedia/interlanguage/LanguageUtil.java +++ b/app/src/main/java/org/wikipedia/language/LanguageUtil.java @@ -1,4 +1,4 @@ -package org.wikipedia.interlanguage; +package org.wikipedia.language; import android.support.annotation.Nullable; diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java b/app/src/main/java/org/wikipedia/page/PageActivity.java index 73e4d42..f702af3 100644 --- a/app/src/main/java/org/wikipedia/page/PageActivity.java +++ b/app/src/main/java/org/wikipedia/page/PageActivity.java @@ -51,7 +51,7 @@ import org.wikipedia.events.ThemeChangeEvent; import org.wikipedia.events.WikipediaZeroStateChangeEvent; import org.wikipedia.history.HistoryEntry; -import org.wikipedia.interlanguage.LangLinksActivity; +import org.wikipedia.language.LangLinksActivity; import org.wikipedia.page.gallery.GalleryActivity; import org.wikipedia.page.linkpreview.LinkPreviewDialog; import org.wikipedia.page.snippet.CompatActionMode; diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java b/app/src/main/java/org/wikipedia/page/PageFragment.java index e9be6eb..78a9ead 100755 --- a/app/src/main/java/org/wikipedia/page/PageFragment.java +++ b/app/src/main/java/org/wikipedia/page/PageFragment.java @@ -47,7 +47,7 @@ import org.wikipedia.concurrency.CallbackTask; import org.wikipedia.editing.EditHandler; import org.wikipedia.history.HistoryEntry; -import org.wikipedia.interlanguage.LangLinksActivity; +import org.wikipedia.language.LangLinksActivity; import org.wikipedia.page.action.PageActionTab; import org.wikipedia.page.action.PageActionToolbarHideHandler; import org.wikipedia.page.gallery.GalleryActivity; diff --git a/app/src/main/java/org/wikipedia/settings/LanguagePreferenceDialog.java b/app/src/main/java/org/wikipedia/settings/LanguagePreferenceDialog.java index e6d588b..996e60f 100644 --- a/app/src/main/java/org/wikipedia/settings/LanguagePreferenceDialog.java +++ b/app/src/main/java/org/wikipedia/settings/LanguagePreferenceDialog.java @@ -18,7 +18,7 @@ import org.wikipedia.R; import org.wikipedia.WikipediaApp; import org.wikipedia.analytics.AppLanguageSelectFunnel; -import org.wikipedia.interlanguage.AppLanguageState; +import org.wikipedia.language.AppLanguageState; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/org/wikipedia/util/L10nUtil.java b/app/src/main/java/org/wikipedia/util/L10nUtil.java index 576120d..f088798 100644 --- a/app/src/main/java/org/wikipedia/util/L10nUtil.java +++ b/app/src/main/java/org/wikipedia/util/L10nUtil.java @@ -14,7 +14,7 @@ import org.wikipedia.R; import org.wikipedia.WikipediaApp; import org.wikipedia.bridge.CommunicationBridge; -import org.wikipedia.interlanguage.LanguageUtil; +import org.wikipedia.language.LanguageUtil; import org.wikipedia.page.PageTitle; import java.util.Arrays; -- To view, visit https://gerrit.wikimedia.org/r/314633 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14785354da76f75301bd7ef17787f8e5519ac47c Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: BearND <bsitzm...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits