1
0
mirror of https://framagit.org/tom79/fedilab-tube synced 2025-06-05 21:09:11 +02:00

3 Commits
1.4.0 ... 1.4.1

Author SHA1 Message Date
62af5c54aa Release 1.4.1 2020-10-11 17:21:45 +02:00
5872f5c99f Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!20
2020-10-11 17:18:41 +02:00
2b1a63e08b New Crowdin updates 2020-10-11 17:18:41 +02:00
7 changed files with 42 additions and 39 deletions

View File

@ -10,8 +10,8 @@ android {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 15 versionCode 16
versionName "1.4.0" versionName "1.4.1"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

View File

@ -1 +1 @@
- Quelques améliorations - Corrige un bug lors de la connexion

View File

@ -1 +1 @@
App for all Peertube instances Приложение для всех серверов Peertube

View File

@ -1,3 +1 @@
- Sepia search - Fix an issue with the authentication of some accounts
- Some fixes with overlay
- Fix issue when changing the instance

View File

@ -83,33 +83,33 @@
<string name="delete_comment">Удалить комментарий</string> <string name="delete_comment">Удалить комментарий</string>
<string name="delete_comment_confirm">Вы уверены, что хотите удалить этот комментарий?</string> <string name="delete_comment_confirm">Вы уверены, что хотите удалить этот комментарий?</string>
<string name="set_video_mode">Режим для видео</string> <string name="set_video_mode">Режим для видео</string>
<string name="filter">Filter</string> <string name="filter">Фильтр</string>
<string name="sepia_search">Sepia search</string> <string name="sepia_search">Поисковик Sepia</string>
<string name="sepia_element_nsfw">Display sensitive content</string> <string name="sepia_element_nsfw">Показывать деликатные видео</string>
<string name="sepia_element_published_date">Published date</string> <string name="sepia_element_published_date">Дата публикации</string>
<string name="any">Any</string> <string name="any">Любые</string>
<string name="today">Today</string> <string name="today">Сегодня</string>
<string name="last_7_days">Last 7 days</string> <string name="last_7_days">Последние 7 дней</string>
<string name="last_30_days">Last 30 days</string> <string name="last_30_days">Последние 30 дней</string>
<string name="last_365_days">Last 365 days</string> <string name="last_365_days">Последние 365 дней</string>
<string name="sepia_element_duration">Duration</string> <string name="sepia_element_duration">Длительность</string>
<string name="duration_short"><![CDATA[Short (<4 min)]]></string> <string name="duration_short"><![CDATA[Короткие (<4 мин)]]></string>
<string name="duration_medium"><![CDATA[Medium (410 min)]]></string> <string name="duration_medium"><![CDATA[Средние (410 мин)]]></string>
<string name="duration_long"><![CDATA[Long (> 10 min)]]></string> <string name="duration_long"><![CDATA[Длинные (> 10 мин)]]></string>
<string name="display_all_categories">Display all categories</string> <string name="display_all_categories">Показать все категории</string>
<string name="display_all_licenses">Display all licenses</string> <string name="display_all_licenses">Показать все лицензии</string>
<string name="display_all_languages">Display all languages</string> <string name="display_all_languages">Показать все языки</string>
<string name="all_of_these_tags">All of these tags</string> <string name="all_of_these_tags">Все с этими тегами</string>
<string name="one_of_these_tags">One of these tags</string> <string name="one_of_these_tags">Один из этих тегов</string>
<string name="apply_filter">Apply filter</string> <string name="apply_filter">Применить фильтр</string>
<string-array name="sort_by_array"> <string-array name="sort_by_array">
<item>Best match</item> <item>Лучшее совпадение</item>
<item>Most recent</item> <item>Последние</item>
<item>Least recent</item> <item>Ранние</item>
</string-array> </string-array>
<string name="sort_by">Sort by</string> <string name="sort_by">Сортировать по</string>
<string name="sepia_search_hint">Keyword, channel, video, etc.</string> <string name="sepia_search_hint">Ключевое слово, канал, видео и т. д.</string>
<string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string> <string name="sepia_indication">Sepia Search отображает видео и каналы, которые соответствуют вашему поиску, но не являются ни издателем, ни владельцем. Если вы заметили какие-либо проблемы с видео, сообщите об этом администраторам на сайте PeerTube, где это видео опубликовано.</string>
<string name="my_videos">Мои видео</string> <string name="my_videos">Мои видео</string>
<string name="title">Название</string> <string name="title">Название</string>
<string name="license">Лицензия</string> <string name="license">Лицензия</string>

View File

@ -134,6 +134,7 @@ public class LoginActivity extends AppCompatActivity {
String[] emailArray = login_uid.getText().toString().split("@"); String[] emailArray = login_uid.getText().toString().split("@");
if (emailArray.length > 1 && !Arrays.asList(Helper.valideEmails).contains(emailArray[1])) { if (emailArray.length > 1 && !Arrays.asList(Helper.valideEmails).contains(emailArray[1])) {
Toasty.error(LoginActivity.this, getString(R.string.email_error_domain, emailArray[1])).show(); Toasty.error(LoginActivity.this, getString(R.string.email_error_domain, emailArray[1])).show();
connectionButton.setEnabled(true);
return; return;
} }
host = emailArray[1]; host = emailArray[1];
@ -141,6 +142,7 @@ public class LoginActivity extends AppCompatActivity {
} else { } else {
if (login_instance == null || login_instance.getText() == null || login_instance.getText().toString().trim().length() == 0) { if (login_instance == null || login_instance.getText() == null || login_instance.getText().toString().trim().length() == 0) {
Toasty.error(LoginActivity.this, getString(R.string.not_valide_instance)).show(); Toasty.error(LoginActivity.this, getString(R.string.not_valide_instance)).show();
connectionButton.setEnabled(true);
return; return;
} }
instance = host = login_instance.getText().toString().trim().toLowerCase(); instance = host = login_instance.getText().toString().trim().toLowerCase();
@ -215,6 +217,7 @@ public class LoginActivity extends AppCompatActivity {
} catch (Error error) { } catch (Error error) {
Error.displayError(LoginActivity.this, error); Error.displayError(LoginActivity.this, error);
error.printStackTrace(); error.printStackTrace();
runOnUiThread(() -> connectionButton.setEnabled(true));
} }
} }
}).start(); }).start();

View File

@ -226,14 +226,16 @@ public class MainActivity extends AppCompatActivity {
editor.putString(Helper.PREF_KEY_NAME, account.getUsername()); editor.putString(Helper.PREF_KEY_NAME, account.getUsername());
//Sync languages from server //Sync languages from server
List<String> videoLanguageServer = userMe.getVideoLanguages(); List<String> videoLanguageServer = userMe.getVideoLanguages();
Set<String> videoLanguageServerSet = new TreeSet<>(videoLanguageServer); if( videoLanguageServer != null) {
videoLanguageServerSet.addAll(videoLanguageServer); Set<String> videoLanguageServerSet = new TreeSet<>(videoLanguageServer);
Set<String> videoLanguageLocal = sharedpreferences.getStringSet(getString(R.string.set_video_language_choice), null); videoLanguageServerSet.addAll(videoLanguageServer);
if (videoLanguageServerSet.size() > 0 && videoLanguageLocal != null) { Set<String> videoLanguageLocal = sharedpreferences.getStringSet(getString(R.string.set_video_language_choice), null);
videoLanguageServer.addAll(videoLanguageLocal); if (videoLanguageServerSet.size() > 0 && videoLanguageLocal != null) {
videoLanguageServer.addAll(videoLanguageLocal);
}
editor.putStringSet(getString(R.string.set_video_language_choice), videoLanguageServerSet);
editor.apply();
} }
editor.putStringSet(getString(R.string.set_video_language_choice), videoLanguageServerSet);
editor.apply();
} }
} catch (Error error) { } catch (Error error) {
error.printStackTrace(); error.printStackTrace();