mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
Matrix Apps: Enable them by default. Remove the settings from LABS section (#1795)
This commit is contained in:
parent
bf200cbe31
commit
915b138af8
11 changed files with 2 additions and 37 deletions
|
@ -320,7 +320,6 @@
|
|||
"settings_contacts_discover_matrix_users" = "Използване на имейл и телефонен номер за откриване на потребители";
|
||||
"settings_contacts_phonebook_country" = "Държава на телефонния указател";
|
||||
"settings_labs_e2e_encryption_prompt_message" = "За да завършите настройката на шифроването, трябва да влезете в профила си отново.";
|
||||
"settings_labs_matrix_apps" = "Matrix приложения";
|
||||
"settings_labs_create_conference_with_jitsi" = "Създаване на групови разговори с jitsi";
|
||||
"settings_term_conditions" = "Правила и условия";
|
||||
"settings_privacy_policy" = "Правила за поверителност";
|
||||
|
|
|
@ -312,7 +312,6 @@
|
|||
"settings_contacts_phonebook_country" = "País de la guia telefònica";
|
||||
"settings_labs_e2e_encryption" = "Xifrat punt a punt";
|
||||
"settings_labs_e2e_encryption_prompt_message" = "Per acabar de ajustar el xifratge has de Iniciar sessió de nou.";
|
||||
"settings_labs_matrix_apps" = "Aplicacions Matrix";
|
||||
"settings_labs_create_conference_with_jitsi" = "Crear trucades amb Jitsi";
|
||||
"settings_version" = "Versió %@";
|
||||
"settings_olm_version" = "Versió Olm %@";
|
||||
|
|
|
@ -439,7 +439,6 @@
|
|||
"send_to" = "Sende an %@";
|
||||
"sending" = "Senden";
|
||||
"room_event_failed_to_send" = "Senden fehlgeschlagen";
|
||||
"settings_labs_matrix_apps" = "Matrix Apps";
|
||||
"room_details_direct_chat" = "Direkter Chat";
|
||||
"room_details_fail_to_update_room_direct" = "Setzen der Direkt-Kennzeichnung in diesem Raum fehlgeschlagen";
|
||||
"event_formatter_widget_added" = "Widget %@ wurde von %@ hinzugefügt";
|
||||
|
|
|
@ -366,7 +366,6 @@
|
|||
|
||||
"settings_labs_e2e_encryption" = "End-to-End Encryption";
|
||||
"settings_labs_e2e_encryption_prompt_message" = "To finish setting up encryption you must log in again.";
|
||||
"settings_labs_matrix_apps" = "Matrix Apps";
|
||||
"settings_labs_create_conference_with_jitsi" = "Create conference calls with jitsi";
|
||||
|
||||
"settings_version" = "Version %@";
|
||||
|
|
|
@ -449,7 +449,6 @@
|
|||
"settings_ui_theme_black" = "Beltza";
|
||||
"settings_ui_theme_picker_title" = "Hautatu itxura bat";
|
||||
"settings_ui_theme_picker_message" = "\"Automatikoa\"-k gailuaren \"alderantzikatu koloreak\" ezarpena erabiltzen du";
|
||||
"settings_labs_matrix_apps" = "Matrix aplikazioak";
|
||||
"settings_enable_rageshake" = "Astindu amorruz akatsaren berri emateko";
|
||||
"room_details_direct_chat" = "Txat zuzena";
|
||||
"event_formatter_widget_added" = "%@ trepeta gehitu du %@ erabiltzaileak";
|
||||
|
|
|
@ -481,7 +481,6 @@
|
|||
"widget_integration_room_not_visible" = "Le salon %@ n'est pas visible.";
|
||||
"auth_share_extension_prompt" = "Se connecter dans l'application principale pour partager du contenu";
|
||||
"room_event_failed_to_send" = "Échec de l'envoi";
|
||||
"settings_labs_matrix_apps" = "Applications Matrix";
|
||||
"event_formatter_jitsi_widget_added" = "Téléconférence en Voix sur IP ajoutée par %@";
|
||||
"event_formatter_jitsi_widget_removed" = "Téléconférence en Voix sur IP supprimée par %@";
|
||||
// Widget Integration Manager
|
||||
|
|
|
@ -473,7 +473,6 @@
|
|||
"settings_ui_theme_black" = "Zwart";
|
||||
"settings_ui_theme_picker_title" = "Selecteer een thema";
|
||||
"settings_ui_theme_picker_message" = "\"Automatisch\" gebruikt de \"Kleurweergave omkeren\" instelling van je apparaat";
|
||||
"settings_labs_matrix_apps" = "Matrix Applicaties";
|
||||
"settings_enable_rageshake" = "Schud de telefoon om een fout te rapporteren";
|
||||
"room_details_direct_chat" = "Privégesprek";
|
||||
"room_details_fail_to_update_room_direct" = "Het is niet gelukt om de direct (privé) vlag in deze ruimte te updaten";
|
||||
|
|
|
@ -435,7 +435,6 @@
|
|||
"sending" = "Отправка";
|
||||
"auth_share_extension_prompt" = "Войти в основное приложение для совместного использования контента";
|
||||
"room_event_failed_to_send" = "Не удалось отправить";
|
||||
"settings_labs_matrix_apps" = "Приложения Matrix";
|
||||
"room_details_direct_chat" = "Прямой чат";
|
||||
"room_details_fail_to_update_room_direct" = "Не удается обновить прямой флаг этой комнаты";
|
||||
"event_formatter_jitsi_widget_added" = "Конференция добавлена %@";
|
||||
|
|
|
@ -306,7 +306,6 @@
|
|||
"settings_contacts_phonebook_country" = "Quốc gia trong danh bạ";
|
||||
"settings_labs_e2e_encryption" = "End-to-End Mã Hóa";
|
||||
"settings_labs_e2e_encryption_prompt_message" = "Để hoàn thành cài đặt mã hóa, bạn phải đăng nhập lại.";
|
||||
"settings_labs_matrix_apps" = "Ứng dụng Matrix";
|
||||
"settings_labs_create_conference_with_jitsi" = "Tạo cuộc gọi hội họp bằng jitsi";
|
||||
"settings_version" = "Phiên bản %@";
|
||||
"settings_olm_version" = "Phiên bản Olm %@";
|
||||
|
|
|
@ -443,5 +443,4 @@
|
|||
"settings_ui_theme_black" = "纯黑";
|
||||
"settings_ui_theme_picker_title" = "选择一个主题";
|
||||
"settings_ui_theme_picker_message" = "“自动”表示使用设备的“反色”设置";
|
||||
"settings_labs_matrix_apps" = "Matrix 应用";
|
||||
"settings_labs_create_conference_with_jitsi" = "使用 jitsi 创建一个会议通话";
|
||||
|
|
|
@ -112,8 +112,7 @@ enum
|
|||
|
||||
enum
|
||||
{
|
||||
LABS_MATRIX_APPS_INDEX = 0,
|
||||
LABS_USE_JITSI_WIDGET_INDEX,
|
||||
LABS_USE_JITSI_WIDGET_INDEX = 0,
|
||||
LABS_CRYPTO_INDEX,
|
||||
LABS_COUNT
|
||||
};
|
||||
|
@ -2024,18 +2023,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
|
|||
}
|
||||
else if (section == SETTINGS_SECTION_LABS_INDEX)
|
||||
{
|
||||
if (row == LABS_MATRIX_APPS_INDEX)
|
||||
{
|
||||
MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
|
||||
|
||||
labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_labs_matrix_apps", @"Vector", nil);
|
||||
labelAndSwitchCell.mxkSwitch.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"matrixApps"];
|
||||
|
||||
[labelAndSwitchCell.mxkSwitch addTarget:self action:@selector(toggleLabsMatrixApps:) forControlEvents:UIControlEventTouchUpInside];
|
||||
|
||||
cell = labelAndSwitchCell;
|
||||
}
|
||||
else if (row == LABS_USE_JITSI_WIDGET_INDEX)
|
||||
if (row == LABS_USE_JITSI_WIDGET_INDEX)
|
||||
{
|
||||
MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
|
||||
|
||||
|
@ -2881,19 +2869,6 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
|
|||
}
|
||||
}
|
||||
|
||||
- (void)toggleLabsMatrixApps:(id)sender
|
||||
{
|
||||
if (sender && [sender isKindOfClass:UISwitch.class])
|
||||
{
|
||||
UISwitch *switchButton = (UISwitch*)sender;
|
||||
|
||||
[[NSUserDefaults standardUserDefaults] setBool:switchButton.isOn forKey:@"matrixApps"];
|
||||
[[NSUserDefaults standardUserDefaults] synchronize];
|
||||
|
||||
[self.tableView reloadData];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)toggleJitsiForConference:(id)sender
|
||||
{
|
||||
if (sender && [sender isKindOfClass:UISwitch.class])
|
||||
|
|
Loading…
Reference in a new issue