From e63799c6e5576ea05d85b2038123ceb542c018c0 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 5 Jul 2023 14:50:40 +0200 Subject: [PATCH] If only usernames are shown from sip addresses: - In contacts, change accounts field label for 'Username'. - Display only usernames in account list into settings. --- linphone-app/assets/languages/cs.ts | 6 ++++++ linphone-app/assets/languages/da.ts | 6 ++++++ linphone-app/assets/languages/de.ts | 6 ++++++ linphone-app/assets/languages/en.ts | 6 ++++++ linphone-app/assets/languages/es.ts | 6 ++++++ linphone-app/assets/languages/fr_FR.ts | 6 ++++++ linphone-app/assets/languages/hu.ts | 6 ++++++ linphone-app/assets/languages/it.ts | 6 ++++++ linphone-app/assets/languages/ja.ts | 6 ++++++ linphone-app/assets/languages/lt.ts | 6 ++++++ linphone-app/assets/languages/pt_BR.ts | 6 ++++++ linphone-app/assets/languages/ru.ts | 6 ++++++ linphone-app/assets/languages/sv.ts | 6 ++++++ linphone-app/assets/languages/tr.ts | 6 ++++++ linphone-app/assets/languages/uk.ts | 6 ++++++ linphone-app/assets/languages/zh_CN.ts | 6 ++++++ linphone-app/ui/views/App/Main/ContactEdit.qml | 6 +++++- linphone-app/ui/views/App/Settings/SettingsSipAccounts.qml | 3 ++- 18 files changed, 103 insertions(+), 2 deletions(-) diff --git a/linphone-app/assets/languages/cs.ts b/linphone-app/assets/languages/cs.ts index 1a1d73d69..4335b5858 100644 --- a/linphone-app/assets/languages/cs.ts +++ b/linphone-app/assets/languages/cs.ts @@ -923,6 +923,7 @@ Adresa URL serveru není nakonfigurována. sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact SIP ÚČTY @@ -998,6 +999,11 @@ Adresa URL serveru není nakonfigurována. 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. Chcete-li vytvořit chatovací místnost založenou na konferenci, musíte v nastavení účtu nastavit URI konference. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index be5ec30a8..0f2a5a794 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -917,6 +917,7 @@ Server url ikke konfigureret. sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact SIP KONTI @@ -992,6 +993,11 @@ Server url ikke konfigureret. 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index 7a4ed5226..46c426ca4 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -917,6 +917,7 @@ Server URL ist nicht konfiguriert. sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact SIP-KONTEN @@ -992,6 +993,11 @@ Server URL ist nicht konfiguriert. 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. Sie müssen eine Konferenz-URI in den Kontoeinstellungen festlegen um einen konferenzbasierten Chatraum zu erstellen. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 0254195ef..ca114235f 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -917,6 +917,7 @@ Server URL not configured. sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact SIP ACCOUNT(S) @@ -992,6 +993,11 @@ Server URL not configured. 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. You need to set the conference URI in your account settings to create a conference based chat room. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index 50a3d259e..1b3f2cd4c 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -917,6 +917,7 @@ URL del servidor no configurada. sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact CUENTA(S) SIP @@ -992,6 +993,11 @@ URL del servidor no configurada. 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. Debe configurar el URL de la conferencia en la configuración de su cuenta para crear una conferencia basada en una sala de chat. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index 65f89cb7d..00120301c 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -917,6 +917,7 @@ URL du serveur non configurée. sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact COMPTE(S) SIP @@ -992,6 +993,11 @@ URL du serveur non configurée. 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. Vous devez définir l'URI de la réunion dans les paramètres de votre compte pour créer une conférence. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index 4db60cf8e..6ddac304b 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -911,6 +911,7 @@ A kiszolgáló URL-je nincs konfigurálva. sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact SIP fiók(ok) @@ -986,6 +987,11 @@ A kiszolgáló URL-je nincs konfigurálva. 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. Konferenciaalapú csevegőszoba létrehozásához be kell állítania a konferencia URI-címét a fiókbeállításokban. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index c5b1692ed..21472a0e6 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -917,6 +917,7 @@ URL del server non configurato. sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact SIP ACCOUNT @@ -992,6 +993,11 @@ URL del server non configurato. 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. Per creare una chat di gruppo è necessario impostare la URI del gruppo nelle impostazioni del tuo account. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index 7d4ef33c1..4ef1a79ef 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -911,6 +911,7 @@ sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact SIPアカウント @@ -986,6 +987,11 @@ 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. 会議ベースのチャットルームを作成するには、アカウント設定で会議URIを設定する必要があります。 + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index 3659e3b3b..dddd07868 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -923,6 +923,7 @@ Nesukonfigūruotas serverio url. sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact SIP PASKYRA(-OS) @@ -998,6 +999,11 @@ Nesukonfigūruotas serverio url. 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index e553885a4..1f82afa7b 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -917,6 +917,7 @@ URL do servidor não configurado. sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact CONTA (S) SIP @@ -992,6 +993,11 @@ URL do servidor não configurado. 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. Você precisa definir o URI da conferência nas configurações da sua conta para criar uma sala de bate-papo baseada em conferência. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index 4cfd10c4b..3077f39f1 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -923,6 +923,7 @@ sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact SIP АККАУНТ(Ы) @@ -998,6 +999,11 @@ 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. Вам необходимо установить URI конференции в настройках вашего аккаунта, чтобы создать чат-комнату на основе конференции. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index d216b4308..8f140fad8 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -917,6 +917,7 @@ Serverwebbadressen är inte konfigurerad. sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact SIP-KONTO(N) @@ -992,6 +993,11 @@ Serverwebbadressen är inte konfigurerad. 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index 8e24fcf29..09ecf79fe 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -911,6 +911,7 @@ Sunucu url'si yapılandırılmadı. sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact SIP HESAPLARI @@ -986,6 +987,11 @@ Sunucu url'si yapılandırılmadı. 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. Toplantı tabanlı konuşma odası oluşturmak için hesap ayarlarınızda toplantı URI'si belirlemelisiniz. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index 451d992f2..dbd467a17 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -923,6 +923,7 @@ sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact SIP ОБЛІКІВКА(И) @@ -998,6 +999,11 @@ 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index d51a6c49f..859083f82 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -911,6 +911,7 @@ sipAccounts + 'SIP ACCOUNT(S)' : label for sip accounts in contact SIP 账户（可有多个） @@ -986,6 +987,11 @@ 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. 您需要在帐户设置中设置会议 URI 以创建基于会议的聊天室。 + + usernames + 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + Contacts diff --git a/linphone-app/ui/views/App/Main/ContactEdit.qml b/linphone-app/ui/views/App/Main/ContactEdit.qml index 100fe3971..28f294d32 100644 --- a/linphone-app/ui/views/App/Main/ContactEdit.qml +++ b/linphone-app/ui/views/App/Main/ContactEdit.qml @@ -312,7 +312,11 @@ ColumnLayout { minValues: _contact ? 1 : 0 placeholder: qsTr('sipAccountsPlaceholder') readOnly: !_edition - title: qsTr('sipAccounts') + title: SettingsModel.sipDisplayMode == UtilsCpp.SIP_DISPLAY_USERNAME + //: 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + ? qsTr('usernames') + //: 'SIP ACCOUNT(S)' : label for sip accounts in contact + : qsTr('sipAccounts') onChanged: Logic.handleSipAddressChanged(addresses, index, oldValue, newValue) onRemoved: _vcard.removeSipAddress(value) diff --git a/linphone-app/ui/views/App/Settings/SettingsSipAccounts.qml b/linphone-app/ui/views/App/Settings/SettingsSipAccounts.qml index 5b41d4a12..2f33ac6ea 100644 --- a/linphone-app/ui/views/App/Settings/SettingsSipAccounts.qml +++ b/linphone-app/ui/views/App/Settings/SettingsSipAccounts.qml @@ -3,6 +3,7 @@ import QtQuick.Layouts 1.3 import Common 1.0 import Linphone 1.0 +import UtilsCpp 1.0 import App.Styles 1.0 @@ -93,7 +94,7 @@ TabContainer { model: SettingsModel.showLocalSipAccount ? AccountSettingsModel.accounts.slice(1) : AccountSettingsModel.accounts delegate: FormTableLine { - title: modelData.sipAddress + title: UtilsCpp.toDisplayString(modelData.sipAddress, SettingsModel.sipDisplayMode) FormTableEntry { ActionButton {