diff --git a/flexiapi/app/Http/Controllers/Account/AuthenticateController.php b/flexiapi/app/Http/Controllers/Account/AuthenticateController.php index 2b36a54..780140d 100644 --- a/flexiapi/app/Http/Controllers/Account/AuthenticateController.php +++ b/flexiapi/app/Http/Controllers/Account/AuthenticateController.php @@ -63,7 +63,7 @@ class AuthenticateController extends Controller } if (!$account) { - return redirect()->back()->withErrors(['authentication' => __('Wrong username or password')]); + return redirect()->back()->withErrors(['authentication' => __('Incorrect username or password')]); } // Try out the passwords @@ -77,7 +77,7 @@ class AuthenticateController extends Controller } } - return redirect()->back()->withErrors(['authentication' => __('Wrong username or password')]); + return redirect()->back()->withErrors(['authentication' => __('Incorrect username or password')]); } public function loginAuthToken(Request $request, ?string $token = null) diff --git a/flexiapi/lang/fr.json b/flexiapi/lang/fr.json index a751967..e49b6cf 100644 --- a/flexiapi/lang/fr.json +++ b/flexiapi/lang/fr.json @@ -7,8 +7,6 @@ "Account recovery": "Récupération de compte", "Account registered": "Compte créé", "Account settings": "Paramètres de compte", - "Account": "Compte", - "Accounts": "Comptes", "Actions": "Actions", "Activate All": "Tout activer", "Activate": "Activer", @@ -20,6 +18,7 @@ "Add existing contacts lists to display them in the user applications.": "Ajouter des listes de contacts existantes afin qu’elles soient visibles dans les applications de l’utilisateur.", "Add": "Ajouter", "Admin": "Administrateur", + "Admins": "Administrateurs", "Administration": "Administration", "All the admins will be super admins": "Tous les administrateurs seront super-administrateurs", "Allow a custom CSS theme": "Autoriser un thème CSS personnalisé", @@ -28,28 +27,32 @@ "An email will be sent to :email with a QR Code and provisioning link.": "Un email sera envoyé à :email contenant un QR Code et un lien de déploiement.", "An email will be sent to this email when someone join the newsletter": "Un email sera envoyé à cette addresse quand quelqu'un rejoint la liste de diffusion", "App Configuration": "Configuration de l'App", + "App settings": "Paramètres d'application", "Api Keys": "Clefs d'API", "Assistant": "Assistant", "Blocked": "Bloqué", + "Broadcast": "Broadcast", "By": "Par", "Calls logs": "Journaux d'appel", + "Call Recording": "Enregistrement d'appels", "Cancel": "Annuler", "Cannot be changed once created.": "Ne peut être changé par la suite.", "Change your email": "Changer votre email", "Change your phone number": "Changer votre numéro de téléphone", - "Chat": "Chat", + "Code Verification" : "Vérification du code", + "instant messaging": "messagerie instantanée", "Check the README.md documentation": "Voir la documentation dans README.md", "Clear to never expire": "Laisser vide pour ne jamais expirer", "Code": "Code", - "Conference": "Conférence", "Configuration": "Configuration", - "Confirm email": "Confirmation de l'email", + "Confirm email": "Confirmer l'email", "Confirm password": "Confirmer le mot de passe", "Confirmed registration text": "Texte de confirmation d'inscription", "Connection": "Connexion", "Contacts List": "Liste de Contacts", "Contacts Lists": "Listes de Contacts", "Contacts": "Contacts", + "Configure": "Configurer", "Copyright text": "Texte droits d'auteurs", "Country code": "Code du pays", "Create": "Créer", @@ -67,14 +70,14 @@ "Display name": "Nom d'affichage", "Domain": "Domaine", "Edit": "Éditer", - "Email registration": "Inscription par email", + "By email": "Inscription par email", "Email": "Email", "Email Server": "Serveur Mail", "Empty": "Vide", "Enable the web interface": "Activer l'interface web", "Enabled": "Activé", "Encrypted": "Chiffré", - "Enter the pin code bellow:": "Entrez le code pin ci-dessous:", + "Enter the code you received below": "Saisissez le code reçu ci-dessous", "Errors": "Erreurs", "Expiration": "Expiration", "Expired": "Expiré", @@ -84,7 +87,6 @@ "Fill to change": "Remplir pour changer", "Fill the related columns if you want to add an external account as well": "Remplissez également les colonnes suivantes si vous souhaitez ajouter un compte externe", "From": "Depuis", - "General settings": "Paramètres généraux", "Host": "Hôte", "I accept the Privacy Policy": "J'accepte la Politique de Confidentialité", "I accept the Terms and Conditions": "J'accepte les Conditions Générales", @@ -115,6 +117,8 @@ "Never": "Jamais", "Never expire": "N'expire jamais", "New Admin": "Nouvel Admin", + "New user": "Nouvel utilisateur", + "New Space": "Nouvel Espace", "Newsletter registration email address": "Addresse email d'inscription à la liste de diffusion", "Newsletter registration confirmed": "Confirmation de l'inscription à la newsletter", "Next": "Suivant", @@ -123,13 +127,14 @@ "No limit": "Sans limite", "No phone yet": "Pas de téléphone pour le moment", "Number of minutes to expire the key after the last request.": "Nombre de minutes avant l'expiration de la clef après son dernier usage.", - "Only display usernames (hide SIP addresses)": "N'afficher que les num d'utilisateur (cacher les addresses SIP)", "Other information": "Autres informations", "Outbound proxy": "Outbound proxy", "Password": "Mot de passe", + "Your password" : "Votre mot de passe", "Phone Countries": "Numéros Internationaux", "Phone number": "Numéro de téléphone", - "Phone registration": "Inscription via mobile", + "By phone": "Par téléphone", + "Phone registration": "Inscription par téléphone", "Please enter the new email that you would like to link to your account.": "Veuillez entre l'adresse email que vous souhaitez lier à votre compte.", "Please enter the new phone number that you would like to link to your account.": "Veuillez entrer le numéro de téléphone que vous souhaitez lier à votre compte.", "Protocol": "Protocole", @@ -139,17 +144,18 @@ "Public registration": "Inscription publiques", "QR Code scanning": "Scan de QR Code", "Realm": "Royaume", - "Record calls": "Enregistrements des appels", "Recover your account using your email": "Récupérer votre compte avec votre email", "Use the mobile app to recover your account using your phone number": "Utilisez l'application mobile pour récupérer votre compte avec votre numéro de téléphone", + "Username or Phone": "Nom d'utilisateur ou téléphone", "Register": "Inscription", "Registrar": "Registrar", "Registration introduction": "Présentation lors de l'inscription", "Registration confirmed": "Confirmation de l'inscription", + "Remote provisioning": "configuration distante", "Remove": "Remove", "Renew": "Renouveller", "Requests": "Requêtes", - "Resend": "Ré-envoyer", + "Resend": "Renvoyer", "Reset password emails": "Email de réinitialisation de mot de passe", "Reset password": "Réinitialiser le mot de passe", "Reset your password": "Réinitialiser votre mot de passe", @@ -157,6 +163,7 @@ "Role": "Rôle", "Scan the following QR Code using an authenticated device and wait a few seconds.": "Scanner le QR Code avec un appareil authentifié et attendez quelques secondes", "Search": "Rechercher", + "Search by username":"Rechercher par nom d'utilisateur", "Select a contacts list": "Sélectionner une liste de contact", "Select a domain": "Sélectionner un domaine", "Select a file": "Choisir un fichier", @@ -164,6 +171,7 @@ "Send an email to the user with provisioning information": "Envoyer un email à l'utilisateur avec les informations de déploiement", "Send": "Envoyer", "Settings": "Paramètres", + "Show usernames only": "Afficher uniquement les noms d'utilisateur", "Sip Adress": "Adresse SIP", "SIP Domain": "Domaine SIP", "Space": "Espace", @@ -178,12 +186,12 @@ "The account doesn't exists": "Le compte n'existe pas", "The code has expired": "Le code a expiré", "The code is not valid": "Le code n'est pas valide", - "The code will be available :minutes minutes.": "Le code sera disponible pendant :minutes minutes.", + "We will send you a verification code to recover your account.": "Nous vous enverrons un code de vérification pour récupérer votre compte.", "The contact doesn't exists": "Le contact n'existe pas", "The file must be in CSV following this template": "Le fichier doit être au format CSV et respecter le modèle suivant", "The first line contains the labels": "La premières ligne contient les étiquettes", "The link can only be visited once": "Le lien ne peut être utilisé qu'une fois", - "Third party SIP": "Adresse SIP tierce", + "Third-party SIP account": "Compte SIP tiers", "This link is not available anymore.": "Ce lien n'est plus disponible.", "This link will be available for :hours hours.": "Ce lien restera disponible pour :hours heures.", "To": "À", @@ -195,14 +203,14 @@ "Updated": "Mise à jour", "Used on": "Utilisé le", "User": "Utilisateur", - "Username or phone number": "Identifiant ou numéro de téléphone", - "Username": "Identifiant", + "Users": "Utilisateurs", + "Username": "Nom d'utilisateur", "Value": "Valeur", "Verify": "Vérifier", "Via": "Via", "Week": "Semaine", "Welcome on :app_name": "Bienvenue sur :app_name", - "Wrong username or password": "Mauvais identifiant ou mot de passe", + "Incorrect username or password": "Nom d'utilisateur ou mot de passe incorrect", "Year": "Année", "You already have an account?": "Vous avez déjà un compte ?", "You are going to permanently delete the following element. Please confirm your action.": "Vous allez supprimer l'élément suivant. Veuillez confirmer votre action.", diff --git a/flexiapi/public/css/form.css b/flexiapi/public/css/form.css index 42d842f..b362363 100644 --- a/flexiapi/public/css/form.css +++ b/flexiapi/public/css/form.css @@ -165,7 +165,8 @@ form label { form input[type="radio"]~label:after, form input[required]+label:after { - content: '*'; + content: '' '*'; + color: var(--danger-5); } form input:not([type=checkbox])~label, diff --git a/flexiapi/resources/views/account/email/validate.blade.php b/flexiapi/resources/views/account/email/validate.blade.php index 94e40bf..52dbe01 100644 --- a/flexiapi/resources/views/account/email/validate.blade.php +++ b/flexiapi/resources/views/account/email/validate.blade.php @@ -2,14 +2,14 @@ @section('content')
-

user-circle {{ __('Change your phone email') }}

+

user-circle {{ __('Code Verification') }}

@csrf

{{ __('A verification code was sent by email to :email.', ['email' => $emailChangeCode->email]) }}

-

{{ __('Enter the pin code bellow:') }}

+

{{ __('Enter the code you received below') }}

@@ -28,8 +28,9 @@

- You didn't receive the code? - Resend a code + + {{ __('You didn't receive the code?') }} + {{ __('Resend') }}

diff --git a/flexiapi/resources/views/account/login.blade.php b/flexiapi/resources/views/account/login.blade.php index 309f8fc..ceb2e45 100644 --- a/flexiapi/resources/views/account/login.blade.php +++ b/flexiapi/resources/views/account/login.blade.php @@ -12,9 +12,9 @@ @csrf
@if (space()->phone_registration) - - + @else @@ -24,7 +24,7 @@
- +
diff --git a/flexiapi/resources/views/account/phone/validate.blade.php b/flexiapi/resources/views/account/phone/validate.blade.php index 629c506..f98e8d1 100644 --- a/flexiapi/resources/views/account/phone/validate.blade.php +++ b/flexiapi/resources/views/account/phone/validate.blade.php @@ -9,7 +9,7 @@

{{ __('A verification code was sent by SMS to :phone.', ['phone' => $phoneChangeCode->phone]) }}

-

{{ __('Enter the pin code bellow:') }}

+

{{ __('Enter the code you received below') }}

diff --git a/flexiapi/resources/views/account/recovery/confirm.blade.php b/flexiapi/resources/views/account/recovery/confirm.blade.php index f41117e..b176ba5 100644 --- a/flexiapi/resources/views/account/recovery/confirm.blade.php +++ b/flexiapi/resources/views/account/recovery/confirm.blade.php @@ -7,7 +7,7 @@ @csrf -

{{ __('Enter the pin code bellow:') }}

+

{{ __('Enter the code you received below') }}

diff --git a/flexiapi/resources/views/account/recovery/show.blade.php b/flexiapi/resources/views/account/recovery/show.blade.php index 26a2343..d621c60 100644 --- a/flexiapi/resources/views/account/recovery/show.blade.php +++ b/flexiapi/resources/views/account/recovery/show.blade.php @@ -11,7 +11,7 @@
@if (config('app.recovery_code_expiration_minutes') > 0)

- {{ __('The code will be available :minutes minutes.', ['minutes' => config('app.recovery_code_expiration_minutes')]) }} + {{ __('We will send you a verification code to recover your account.') }}

@endif @include('parts.errors', ['name' => 'code']) @@ -35,7 +35,7 @@ @elseif($method == 'phone') @if (config('app.recovery_code_expiration_minutes') > 0)

- {{ __('The code will be available :minutes minutes.', ['minutes' => config('app.recovery_code_expiration_minutes')]) }} + {{ __('We will send you a verification code to recover your account.') }}

@endif
diff --git a/flexiapi/resources/views/admin/account/create_edit.blade.php b/flexiapi/resources/views/admin/account/create_edit.blade.php index 9fd29bf..592f5f6 100644 --- a/flexiapi/resources/views/admin/account/create_edit.blade.php +++ b/flexiapi/resources/views/admin/account/create_edit.blade.php @@ -21,7 +21,7 @@ @include('admin.account.parts.tabs') @else
-

users {{ __('Create') }}

+

users {{ __('New user') }}

{{ __('Cancel') }}
@endif diff --git a/flexiapi/resources/views/admin/account/import/create.blade.php b/flexiapi/resources/views/admin/account/import/create.blade.php index 2cc7cea..d02f262 100644 --- a/flexiapi/resources/views/admin/account/import/create.blade.php +++ b/flexiapi/resources/views/admin/account/import/create.blade.php @@ -20,7 +20,7 @@

{{ __('The file must be in CSV following this template') }}: example_template.csv

-

{{ __('Account') }}

+

{{ __('User') }}

{{ __('The first line contains the labels') }}

  1. {{ __('Username') }}*
  2. diff --git a/flexiapi/resources/views/admin/account/index.blade.php b/flexiapi/resources/views/admin/account/index.blade.php index 1a6a1e1..e300bd3 100644 --- a/flexiapi/resources/views/admin/account/index.blade.php +++ b/flexiapi/resources/views/admin/account/index.blade.php @@ -2,12 +2,12 @@ @section('content')
    -

    users {{ __('Accounts') }}

    +

    users {{ __('Users') }}

    @if ($space)

    {{ $accounts->count()}} / @if ($space->max_accounts > 0){{ $space->max_accounts }} @else infinity@endif

    @endif - download-simple + upload-simple {{ __('Import') }} @if (space()?->intercom_features) @@ -17,8 +17,8 @@ @endif - plus - {{ __('Create') }} + user-plus + {{ __('New user') }}
    @@ -27,7 +27,7 @@ diff --git a/flexiapi/resources/views/admin/account/parts/breadcrumb_accounts_index.blade.php b/flexiapi/resources/views/admin/account/parts/breadcrumb_accounts_index.blade.php index 844c237..2a28d28 100644 --- a/flexiapi/resources/views/admin/account/parts/breadcrumb_accounts_index.blade.php +++ b/flexiapi/resources/views/admin/account/parts/breadcrumb_accounts_index.blade.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/flexiapi/resources/views/admin/space/configuration.blade.php b/flexiapi/resources/views/admin/space/configuration.blade.php index c6f3568..23b3471 100644 --- a/flexiapi/resources/views/admin/space/configuration.blade.php +++ b/flexiapi/resources/views/admin/space/configuration.blade.php @@ -67,7 +67,7 @@ @include('parts.errors', ['name' => 'account_proxy_registrar_address'])
    -

    {{ __('Provisioning') }}

    +

    {{ __('Remote provisioning') }}

    diff --git a/flexiapi/resources/views/admin/space/edit.blade.php b/flexiapi/resources/views/admin/space/edit.blade.php index ef2990a..602356b 100644 --- a/flexiapi/resources/views/admin/space/edit.blade.php +++ b/flexiapi/resources/views/admin/space/edit.blade.php @@ -27,14 +27,14 @@

    {{ __('Features') }}

    - @include('parts.form.toggle', ['object' => $space, 'key' => 'disable_chat_feature', 'label' => __('Chat'), 'reversed' => true]) + @include('parts.form.toggle', ['object' => $space, 'key' => 'disable_chat_feature', 'label' => __('instant messaging'), 'reversed' => true]) @include('parts.form.toggle', ['object' => $space, 'key' => 'disable_meetings_feature', 'label' => __('Meeting'), 'reversed' => true]) - @include('parts.form.toggle', ['object' => $space, 'key' => 'disable_broadcast_feature', 'label' => __('Conference'), 'reversed' => true]) - @include('parts.form.toggle', ['object' => $space, 'key' => 'hide_settings', 'label' => __('General settings'), 'reversed' => true]) + @include('parts.form.toggle', ['object' => $space, 'key' => 'disable_broadcast_feature', 'label' => __('Broadcast'), 'reversed' => true]) + @include('parts.form.toggle', ['object' => $space, 'key' => 'hide_settings', 'label' => __('App settings'), 'reversed' => true]) @include('parts.form.toggle', ['object' => $space, 'key' => 'hide_account_settings', 'label' => __('Account settings'), 'reversed' => true]) - @include('parts.form.toggle', ['object' => $space, 'key' => 'disable_call_recordings_feature', 'label' => __('Record calls'), 'reversed' => true]) + @include('parts.form.toggle', ['object' => $space, 'key' => 'disable_call_recordings_feature', 'label' => __('Call Recording'), 'reversed' => true]) - @include('parts.form.toggle', ['object' => $space, 'key' => 'only_display_sip_uri_username', 'label' => __('Only display usernames (hide SIP addresses)')]) + @include('parts.form.toggle', ['object' => $space, 'key' => 'only_display_sip_uri_username', 'label' => __('Show usernames only')])
    diff --git a/flexiapi/resources/views/admin/space/index.blade.php b/flexiapi/resources/views/admin/space/index.blade.php index 7c20acf..9943d23 100644 --- a/flexiapi/resources/views/admin/space/index.blade.php +++ b/flexiapi/resources/views/admin/space/index.blade.php @@ -6,7 +6,7 @@

    globe-hemisphere-west {{ __('Spaces') }}

    plus - {{ __('Create') }} + {{ __('New Space') }} diff --git a/flexiapi/resources/views/admin/space/show.blade.php b/flexiapi/resources/views/admin/space/show.blade.php index 20bc48b..bc2165c 100644 --- a/flexiapi/resources/views/admin/space/show.blade.php +++ b/flexiapi/resources/views/admin/space/show.blade.php @@ -31,7 +31,7 @@
    users -

    {{ __('Accounts') }}

    +

    {{ __('Users') }}

    {{ $space->accounts()->count() }} / @@ -57,7 +57,7 @@ isFull())disabled @endif href="{{ route('admin.account.create', ['admin' => true, 'domain' => $space->domain]) }}">user-plus {{ __('New Admin') }} -

    Admins

    +

    {{ __('Admins') }}

    diff --git a/flexiapi/resources/views/admin/statistics/parts/tabs.blade.php b/flexiapi/resources/views/admin/statistics/parts/tabs.blade.php index 4a82eb6..8a0a684 100644 --- a/flexiapi/resources/views/admin/statistics/parts/tabs.blade.php +++ b/flexiapi/resources/views/admin/statistics/parts/tabs.blade.php @@ -1,6 +1,6 @@ @include('parts.tabs', [ 'items' => [ - route('admin.statistics.show', ['type' => 'accounts']) => __('Accounts'), + route('admin.statistics.show', ['type' => 'accounts']) => __('Users'), route('admin.statistics.show', ['type' => 'calls']) => __('Calls'), route('admin.statistics.show_call_logs') => __('Calls logs'), route('admin.statistics.show', ['type' => 'messages']) => __('Messages'), diff --git a/flexiapi/resources/views/parts/sidebar.blade.php b/flexiapi/resources/views/parts/sidebar.blade.php index 45f1114..2f3543f 100644 --- a/flexiapi/resources/views/parts/sidebar.blade.php +++ b/flexiapi/resources/views/parts/sidebar.blade.php @@ -9,7 +9,7 @@ $items['admin.spaces.me'] = ['title' => __('My Space'), 'icon' => 'globe-hemisphere-west']; } - $items['admin.account.index'] = ['title' => __('Accounts'), 'icon' => 'users']; + $items['admin.account.index'] = ['title' => __('Users'), 'icon' => 'users']; $items['admin.contacts_lists.index'] = ['title' => __('Contacts Lists'), 'icon' => 'user-rectangle']; $items['admin.statistics.show'] = ['title' => __('Statistics'), 'icon' => 'chart-donut']; $items['admin.api_keys.index'] = ['title' => __('Settings'), 'icon' => 'gear']; diff --git a/flexiapi/resources/views/parts/tabs/register.blade.php b/flexiapi/resources/views/parts/tabs/register.blade.php index 4a46ea3..b98697b 100644 --- a/flexiapi/resources/views/parts/tabs/register.blade.php +++ b/flexiapi/resources/views/parts/tabs/register.blade.php @@ -1,6 +1,6 @@ @if(space()->phone_registration) @include('parts.tabs', ['items' => [ - route('account.register.phone') => __('Phone registration'), - route('account.register.email') => __('Email registration'), + route('account.register.phone') => __('By phone'), + route('account.register.email') => __('By email'), ]]) @endif