Merge pull request #2913 from yausername/fixTranslatableUrl

made instance list url non translatable
This commit is contained in:
Tobias Groza 2019-12-31 15:51:27 +01:00 committed by GitHub
commit 7f0a9904ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions

View file

@ -89,6 +89,13 @@ public class PeertubeInstanceListFragment extends Fragment {
public void onViewCreated(@NonNull View rootView, @Nullable Bundle savedInstanceState) {
super.onViewCreated(rootView, savedInstanceState);
initViews(rootView);
}
private void initViews(@NonNull View rootView) {
TextView instanceHelpTV = rootView.findViewById(R.id.instanceHelpTV);
instanceHelpTV.setText(getString(R.string.peertube_instance_url_help, getString(R.string.peertube_instance_list_url)));
initButton(rootView);
RecyclerView listInstances = rootView.findViewById(R.id.instances);

View file

@ -543,7 +543,6 @@
<string name="seek_duration_title">تسريع إلى الأمام/-ترجيع وقت البحث</string>
<string name="peertube_instance_url_title">نموذج بيرتوب</string>
<string name="peertube_instance_url_summary">تعيين حالات بيرتوب المفضلة لديك</string>
<string name="peertube_instance_url_help">ابحث عن النموذج التي يناسبك على https://joinpeertube.org/instances#instances-list</string>
<string name="peertube_instance_add_title">إضافة نموذج</string>
<string name="peertube_instance_add_help">أدخل رابط نموذج</string>
<string name="peertube_instance_add_fail">فشل في التحقق من النموذج</string>

View file

@ -112,7 +112,8 @@
<string name="content_language_title">Default content language</string>
<string name="peertube_instance_url_title">PeerTube instances</string>
<string name="peertube_instance_url_summary">Set your favorite peertube instances</string>
<string name="peertube_instance_url_help">Find the instances that best suit you on https://joinpeertube.org/instances#instances-list</string>
<string name="peertube_instance_url_help">Find the instances that best suit you on %s</string>
<string name="peertube_instance_list_url" translatable="false">https://joinpeertube.org/instances#instances-list</string>
<string name="peertube_instance_add_title">Add instance</string>
<string name="peertube_instance_add_help">Enter instance url</string>
<string name="peertube_instance_add_fail">Failed to validate instance</string>