Mholloway has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200917
Change subject: Add local language article name to 'Read in other languages'
list
......................................................................
Add local language article name to 'Read in other languages' list
Bug: T68917
Change-Id: I07afb09bed945d99d7d8aaa1912ad46c4217d55e
---
M wikipedia/res/layout/item_language_list_entry.xml
M wikipedia/res/values/strings.xml
M wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
3 files changed, 11 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/17/200917/1
diff --git a/wikipedia/res/layout/item_language_list_entry.xml
b/wikipedia/res/layout/item_language_list_entry.xml
index e79cd40..3c85b48 100644
--- a/wikipedia/res/layout/item_language_list_entry.xml
+++ b/wikipedia/res/layout/item_language_list_entry.xml
@@ -11,12 +11,8 @@
android:paddingBottom="8dp"
android:background="@drawable/selectable_item_background"
>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <TextView
- android:id="@+id/language_list_language_local_name"
+ <TextView
+ android:id="@+id/language_list_language_article_local_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -24,29 +20,7 @@
android:singleLine="true"
android:ellipsize="marquee"
tools:text="Language local name"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="center_vertical"
- android:layout_marginRight="4dp"
- android:layout_marginLeft="4dp"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:text="–"
- />
- <TextView
- android:id="@+id/language_list_article_local_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="center_vertical"
- android:singleLine="true"
- android:ellipsize="marquee"
- tools:text="Article local name"
- />
- </LinearLayout>
+ />
<TextView
android:id="@+id/language_list_language_name"
android:layout_width="wrap_content"
@@ -56,5 +30,5 @@
android:singleLine="true"
android:ellipsize="marquee"
tools:text="Language English name"
- />
+ />
</LinearLayout>
diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index 30d1ac8..c46b2fb 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -66,6 +66,7 @@
<string name="langlinks_empty">This page is not available in other
languages.</string>
<string name="langlinks_no_match">No languages found matching your
query.</string>
<string name="langlinks_activity_title">Other languages</string>
+ <string name="langlinks_local_language_article_name">%1$s | %2$s</string>
<string name="menu_save_changes">Save changes</string>
<string name="edit_section_error_retry">Retry</string>
<string name="dialog_saving_in_progress">Saving…</string>
diff --git
a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
index c1bb7bf..5c5b4f5 100644
--- a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
@@ -238,18 +238,20 @@
}
TextView langNameText = (TextView)
convertView.findViewById(R.id.language_list_language_name);
- TextView langLocalNameText = (TextView)
convertView.findViewById(R.id.language_list_language_local_name);
- TextView articleLocalNameText = (TextView)
convertView.findViewById(R.id.language_list_article_local_name);
+ TextView langArticleLocalNameText = (TextView)
convertView.findViewById(R.id.language_list_language_article_local_name);
PageTitle langLink = (PageTitle) getItem(position);
String wikiCode = langLink.getSite().getLanguage();
+ //String languageArticleName =
app.getString(R.string.langlinks_local_language_article_name);
+
int langIndex = app.findWikiIndex(wikiCode);
langNameText.setText(app.canonicalNameFor(langIndex));
- langLocalNameText.setText(app.localNameFor(langIndex));
- articleLocalNameText.setText(langLink.getText());
+
langArticleLocalNameText.setText(String.format(app.getString(R.string.langlinks_local_language_article_name),
+
app.localNameFor(langIndex),
+
langLink.getText()));
return convertView;
}
--
To view, visit https://gerrit.wikimedia.org/r/200917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I07afb09bed945d99d7d8aaa1912ad46c4217d55e
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
