Skip to content

Commit 1e80f68

Browse files
committed
used CDATA
1 parent b057d8c commit 1e80f68

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

app/src/main/java/fr/free/nrw/commons/AboutActivity.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.content.Intent;
77
import android.net.Uri;
88
import android.os.Bundle;
9+
import android.text.Html;
910
import android.text.SpannableString;
1011
import android.text.style.UnderlineSpan;
1112
import android.util.Log;
@@ -62,6 +63,18 @@ public void onCreate(Bundle savedInstanceState) {
6263
content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
6364
faqText.setText(content);
6465
versionText.setText(BuildConfig.VERSION_NAME);
66+
TextView rate_us = findViewById(R.id.about_rate_us);
67+
TextView privacy_policy = findViewById(R.id.about_privacy_policy);
68+
TextView translate = findViewById(R.id.about_translate);
69+
TextView credits = findViewById(R.id.about_credits);
70+
TextView faq = findViewById(R.id.about_faq);
71+
72+
rate_us.setText(Html.fromHtml(getString(R.string.about_rate_us)));
73+
privacy_policy.setText(Html.fromHtml(getString(R.string.about_privacy_policy)));
74+
translate.setText(Html.fromHtml(getString(R.string.about_translate)));
75+
credits.setText(Html.fromHtml(getString(R.string.about_credits)));
76+
faq.setText(Html.fromHtml(getString(R.string.about_faq)));
77+
6578
initDrawer();
6679
}
6780

app/src/main/res/layout/activity_about.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
android:layout_marginTop="@dimen/standard_gap"
112112
android:gravity="center"
113113
android:textColor="@color/primaryColor"
114-
android:text="@string/about_rate_us" />
114+
/>
115115

116116
<TextView
117117
android:id="@+id/about_privacy_policy"
@@ -121,7 +121,7 @@
121121
android:layout_marginTop="@dimen/standard_gap"
122122
android:textColor="@color/primaryColor"
123123
android:gravity="center"
124-
android:text="@string/about_privacy_policy" />
124+
/>
125125

126126
<TextView
127127
android:id="@+id/about_translate"
@@ -131,7 +131,7 @@
131131
android:textColor="@color/primaryColor"
132132
android:layout_marginTop="@dimen/standard_gap"
133133
android:gravity="center"
134-
android:text="@string/about_translate" />
134+
/>
135135

136136
<TextView
137137
android:id="@+id/about_credits"
@@ -141,7 +141,7 @@
141141
android:textColor="@color/primaryColor"
142142
android:layout_marginTop="@dimen/standard_gap"
143143
android:gravity="center"
144-
android:text="@string/about_credits" />
144+
/>
145145

146146
<TextView
147147
android:id="@+id/about_faq"

app/src/main/res/values/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
<string name="about_license">The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. </string>
8787
<string name="trademarked_name" translatable="false">Wikimedia Commons</string>
8888
<string name="about_improve">Create a new &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub issue&lt;/a&gt; for bug reports and suggestions.</string>
89-
<string name="about_privacy_policy"><u>Privacy policy</u></string>
90-
<string name="about_credits"><u>Credits</u></string>
89+
<string name="about_privacy_policy"><![CDATA[<u>Privacy policy</u>]]></string>
90+
<string name="about_credits"><![CDATA[<u>Credits</u>]]></string>
9191
<string name="title_activity_about">About</string>
9292
<string name="menu_feedback">Send Feedback (via Email)</string>
9393
<string name="no_email_client">No email client installed</string>
@@ -253,16 +253,16 @@
253253
<string name="nearby_wikipedia">WIKIPEDIA</string>
254254
<string name="nearby_commons">COMMONS</string>
255255

256-
<string name="about_rate_us"><u>Rate us</u></string>
257-
<string name="about_faq">FAQ</string>
256+
<string name="about_rate_us"><![CDATA[<u>Rate us</u>]]></string>
257+
<string name="about_faq"><![CDATA[<u>FAQ</u>]]></string>
258258
<string name="welcome_skip_button">Skip Tutorial</string>
259259

260260
<string name="no_internet">Internet unavailable</string>
261261
<string name="internet_established">Internet available</string>
262262
<string name="error_notifications">Error fetching notifications</string>
263263
<string name="no_notifications">No notifications found</string>
264264

265-
<string name="about_translate"><u>Translate</u></string>
265+
<string name="about_translate"><![CDATA[<u>Translate</u>]]></string>
266266
<string name="about_translate_title">Languages</string>
267267
<string name="about_translate_message">Select the language that you would like to submit translations for</string>
268268
<string name="about_translate_proceed">Proceed</string>

0 commit comments

Comments
 (0)