Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set hardcoded string to translatable #188

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Set hardcoded string to translatable #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75ff57b
Update PreferencesInformationAbout.java
Apr 6, 2018
3b7c5b9
Update strings.xml
Apr 6, 2018
046b0ce
Update dialog_about.xml
Apr 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/src/main/java/de/qspool/clementineremote/ui/settings/PreferencesInformationAbout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,10 @@ public boolean onPreferenceClick(Preference preference) {
// Supporters
tvSupporters.setText("David Sansome (Clementine-Dev)\n" +
"John Maguire (Clementine-Dev)\n" +
"Arnaud Bienner (Clementine-Dev)");
"Arnaud Bienner (Clementine-Dev)\n");

// Others
tvOthers.setText(Html.fromHtml(
"Thanks to all the <a href=\"https://github.com/clementine-player/Android-Remote/graphs/contributors\">contributors</a> and <a href=\"https://www.transifex.com/projects/p/clementine-remote/\">translators</a>!"));
tvOthers.setText(Html.fromHtml(getString(R.string.dialog_about_others_summary)));
tvOthers.setMovementMethod(LinkMovementMethod.getInstance());

return true;
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/dialog_about.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/dialog_about_others_summary"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't be necessary, the text is set in PreferencesInformationAbout and this would be overridden.

android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>

</ScrollView>
</ScrollView>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
<string name="dialog_about_authors">Authors</string>
<string name="dialog_about_supporters">Supporters</string>
<string name="dialog_about_others">Others</string>
<string name="dialog_about_others_summary">Thanks to all the &lt;a href=\"https://github.com/clementine-player/Android-Remote/graphs/contributors\">contributors&lt;/a> and &lt;a href=\"https://www.transifex.com/projects/p/clementine-remote/\">translators&lt;/a>!</string>
<string name="dialog_license_top"> This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY</string>

<string name="tasker_intro">Please select an action.</string>
Expand Down