diff --git a/app/contacts/app_languages.php b/app/contacts/app_languages.php index ea4304ed4f..c288bca4ca 100644 --- a/app/contacts/app_languages.php +++ b/app/contacts/app_languages.php @@ -1849,27 +1849,27 @@ $text['label-shared']['ru-ru'] = "Общий"; $text['label-shared']['sv-se'] = "Delad"; $text['label-shared']['uk-ua'] = ""; -$text['label-primary']['en-us'] = "Primary"; -$text['label-primary']['en-gb'] = "Primary"; -$text['label-primary']['ar-eg'] = ""; -$text['label-primary']['de-at'] = "Primär"; //copied from de-de -$text['label-primary']['de-ch'] = "Primär"; //copied from de-de -$text['label-primary']['de-de'] = "Primär"; -$text['label-primary']['el-gr'] = "Κύρια"; -$text['label-primary']['es-cl'] = "Primário"; -$text['label-primary']['es-mx'] = "Primário"; //copied from es-cl -$text['label-primary']['fr-ca'] = "Primaire"; //copied from fr-fr -$text['label-primary']['fr-fr'] = "Primaire"; -$text['label-primary']['he-il'] = "ראשי"; -$text['label-primary']['it-it'] = "Primario"; -$text['label-primary']['nl-nl'] = "Primair"; -$text['label-primary']['pl-pl'] = "Główny"; -$text['label-primary']['pt-br'] = "Primário"; //copied from pt-pt -$text['label-primary']['pt-pt'] = "Primário"; -$text['label-primary']['ro-ro'] = ""; -$text['label-primary']['ru-ru'] = "Основной"; -$text['label-primary']['sv-se'] = "Primär"; -$text['label-primary']['uk-ua'] = ""; +$text['label-phone_label']['en-us'] = "Label"; +$text['label-phone_label']['en-gb'] = "Label"; +$text['label-phone_label']['ar-eg'] = ""; +$text['label-phone_label']['de-at'] = "Kennzeichnung"; //copied from de-de +$text['label-phone_label']['de-ch'] = "Kennzeichnung"; //copied from de-de +$text['label-phone_label']['de-de'] = "Kennzeichnung"; +$text['label-phone_label']['el-gr'] = "Ετικέτα"; +$text['label-phone_label']['es-cl'] = "Etiqueta"; +$text['label-phone_label']['es-mx'] = "Etiqueta"; //copied from es-cl +$text['label-phone_label']['fr-ca'] = "Etiquette"; //copied from fr-fr +$text['label-phone_label']['fr-fr'] = "Etiquette"; +$text['label-phone_label']['he-il'] = ""; +$text['label-phone_label']['it-it'] = "Etichetta"; +$text['label-phone_label']['nl-nl'] = "Etiket"; +$text['label-phone_label']['pl-pl'] = "Etykieta"; +$text['label-phone_label']['pt-br'] = "Identificador"; +$text['label-phone_label']['pt-pt'] = "Etiqueta"; +$text['label-phone_label']['ro-ro'] = ""; +$text['label-phone_label']['ru-ru'] = "Метка"; +$text['label-phone_label']['sv-se'] = "Etikett"; +$text['label-phone_label']['uk-ua'] = "Назва"; $text['label-phone_type']['en-us'] = "Type"; $text['label-phone_type']['en-gb'] = "Type"; @@ -2003,28 +2003,6 @@ $text['label-phone_number']['ru-ru'] = "Номер"; $text['label-phone_number']['sv-se'] = "Nummer"; $text['label-phone_number']['uk-ua'] = "Номер"; -$text['label-phone_label']['en-us'] = "Label"; -$text['label-phone_label']['en-gb'] = "Label"; -$text['label-phone_label']['ar-eg'] = ""; -$text['label-phone_label']['de-at'] = "Kennzeichnung"; //copied from de-de -$text['label-phone_label']['de-ch'] = "Kennzeichnung"; //copied from de-de -$text['label-phone_label']['de-de'] = "Kennzeichnung"; -$text['label-phone_label']['el-gr'] = "Ετικέτα"; -$text['label-phone_label']['es-cl'] = "Etiqueta"; -$text['label-phone_label']['es-mx'] = "Etiqueta"; //copied from es-cl -$text['label-phone_label']['fr-ca'] = "Etiquette"; //copied from fr-fr -$text['label-phone_label']['fr-fr'] = "Etiquette"; -$text['label-phone_label']['he-il'] = ""; -$text['label-phone_label']['it-it'] = "Etichetta"; -$text['label-phone_label']['nl-nl'] = "Etiket"; -$text['label-phone_label']['pl-pl'] = "Etykieta"; -$text['label-phone_label']['pt-br'] = "Identificador"; -$text['label-phone_label']['pt-pt'] = "Etiqueta"; -$text['label-phone_label']['ro-ro'] = ""; -$text['label-phone_label']['ru-ru'] = "Метка"; -$text['label-phone_label']['sv-se'] = "Etikett"; -$text['label-phone_label']['uk-ua'] = "Назва"; - $text['label-phone_extension']['en-us'] = "Extension"; $text['label-phone_extension']['en-gb'] = "Extension"; $text['label-phone_extension']['ar-eg'] = ""; @@ -2047,6 +2025,28 @@ $text['label-phone_extension']['ru-ru'] = "Внутренний Номер"; $text['label-phone_extension']['sv-se'] = "Anknytning"; $text['label-phone_extension']['uk-ua'] = "Розширення"; +$text['label-primary']['en-us'] = "Primary"; +$text['label-primary']['en-gb'] = "Primary"; +$text['label-primary']['ar-eg'] = ""; +$text['label-primary']['de-at'] = "Primär"; //copied from de-de +$text['label-primary']['de-ch'] = "Primär"; //copied from de-de +$text['label-primary']['de-de'] = "Primär"; +$text['label-primary']['el-gr'] = "Κύρια"; +$text['label-primary']['es-cl'] = "Primário"; +$text['label-primary']['es-mx'] = "Primário"; //copied from es-cl +$text['label-primary']['fr-ca'] = "Primaire"; //copied from fr-fr +$text['label-primary']['fr-fr'] = "Primaire"; +$text['label-primary']['he-il'] = "ראשי"; +$text['label-primary']['it-it'] = "Primario"; +$text['label-primary']['nl-nl'] = "Primair"; +$text['label-primary']['pl-pl'] = "Główny"; +$text['label-primary']['pt-br'] = "Primário"; //copied from pt-pt +$text['label-primary']['pt-pt'] = "Primário"; +$text['label-primary']['ro-ro'] = ""; +$text['label-primary']['ru-ru'] = "Основной"; +$text['label-primary']['sv-se'] = "Primär"; +$text['label-primary']['uk-ua'] = ""; + $text['label-phone_description']['en-us'] = "Description"; $text['label-phone_description']['en-gb'] = "Description"; $text['label-phone_description']['ar-eg'] = ""; @@ -4401,6 +4401,28 @@ $text['description-shared']['ru-ru'] = "Разделите этот контак $text['description-shared']['sv-se'] = "Dela denna kontakt med andra användare i domänen."; $text['description-shared']['uk-ua'] = ""; +$text['description-phone_label']['en-us'] = "Select or enter a custom label."; +$text['description-phone_label']['en-gb'] = "Select or enter a custom label."; +$text['description-phone_label']['ar-eg'] = ""; +$text['description-phone_label']['de-at'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de +$text['description-phone_label']['de-ch'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de +$text['description-phone_label']['de-de'] = "Wählen Sie eine beliebige Kennzeichnung."; +$text['description-phone_label']['el-gr'] = "Επιλέξτε ή εισάγετε μια προσωποποιημένη ετικέτα"; +$text['description-phone_label']['es-cl'] = "Seleccione o introduzca una etiqueta personalizada."; +$text['description-phone_label']['es-mx'] = "Seleccione o introduzca una etiqueta personalizada."; //copied from es-cl +$text['description-phone_label']['fr-ca'] = "Sélectionnez ou entrez une étiquette personnalisée."; //copied from fr-fr +$text['description-phone_label']['fr-fr'] = "Sélectionnez ou entrez une étiquette personnalisée."; +$text['description-phone_label']['he-il'] = ""; +$text['description-phone_label']['it-it'] = "Seleziona o inserisci un'etichetta personalizzata."; +$text['description-phone_label']['nl-nl'] = "Kies of voer een keuze kenmerk in."; +$text['description-phone_label']['pl-pl'] = "Wybierz lub wprowadź własną etykietę."; +$text['description-phone_label']['pt-br'] = "Selecione ou digite um identificador personalizado"; +$text['description-phone_label']['pt-pt'] = "Selecione ou digite um rótulo personalizado."; +$text['description-phone_label']['ro-ro'] = ""; +$text['description-phone_label']['ru-ru'] = "Выберите или введите настраиваемую метку."; +$text['description-phone_label']['sv-se'] = "Välj eller ange anpassad etikett."; +$text['description-phone_label']['uk-ua'] = ""; + $text['description-phone_type']['en-us'] = "Define the number type or purpose."; $text['description-phone_type']['en-gb'] = "Define the number type or purpose."; $text['description-phone_type']['ar-eg'] = ""; @@ -4423,28 +4445,6 @@ $text['description-phone_type']['ru-ru'] = "Определите тип или $text['description-phone_type']['sv-se'] = "Definiera nummertypen eller nummerändamålet."; $text['description-phone_type']['uk-ua'] = ""; -$text['description-phone_primary']['en-us'] = "Set as the primary Number for this contact."; -$text['description-phone_primary']['en-gb'] = "Set as the primary Number for this contact."; -$text['description-phone_primary']['ar-eg'] = ""; -$text['description-phone_primary']['de-at'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de -$text['description-phone_primary']['de-ch'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de -$text['description-phone_primary']['de-de'] = "Als primäre Nummer für diesen Kontakt setzen."; -$text['description-phone_primary']['el-gr'] = "Ορίστε τον κύριο αριθμό για αυτή την επαφή"; -$text['description-phone_primary']['es-cl'] = "Establecer como el número primario para este contacto."; -$text['description-phone_primary']['es-mx'] = "Establecer como el número primario para este contacto."; //copied from es-cl -$text['description-phone_primary']['fr-ca'] = "Définir comme primaire numéro pour ce contact."; //copied from fr-fr -$text['description-phone_primary']['fr-fr'] = "Définir comme primaire numéro pour ce contact."; -$text['description-phone_primary']['he-il'] = ""; -$text['description-phone_primary']['it-it'] = "Imposta come numero principale per questo contatto."; -$text['description-phone_primary']['nl-nl'] = "Stel nummer in als primair nummer voor dit kontact"; -$text['description-phone_primary']['pl-pl'] = "Ustaw jako podstawowy numer tego kontaktu."; -$text['description-phone_primary']['pt-br'] = "Defina número principal para este contato"; -$text['description-phone_primary']['pt-pt'] = "Definir como o principal número para este contato."; -$text['description-phone_primary']['ro-ro'] = ""; -$text['description-phone_primary']['ru-ru'] = "Укажите в качестве основного номера для этого контакта."; -$text['description-phone_primary']['sv-se'] = "Sätt som primärt Nummer för denna kontakt."; -$text['description-phone_primary']['uk-ua'] = ""; - $text['description-phone_speed_dial']['en-us'] = "Enter the speed dial number."; $text['description-phone_speed_dial']['en-gb'] = "Enter the speed dial number."; $text['description-phone_speed_dial']['ar-eg'] = ""; @@ -4511,28 +4511,6 @@ $text['description-phone_number']['ru-ru'] = "Введите номер теле $text['description-phone_number']['sv-se'] = "Ange telefonnummer."; $text['description-phone_number']['uk-ua'] = ""; -$text['description-phone_label']['en-us'] = "Select or enter a custom label."; -$text['description-phone_label']['en-gb'] = "Select or enter a custom label."; -$text['description-phone_label']['ar-eg'] = ""; -$text['description-phone_label']['de-at'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de -$text['description-phone_label']['de-ch'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de -$text['description-phone_label']['de-de'] = "Wählen Sie eine beliebige Kennzeichnung."; -$text['description-phone_label']['el-gr'] = "Επιλέξτε ή εισάγετε μια προσωποποιημένη ετικέτα"; -$text['description-phone_label']['es-cl'] = "Seleccione o introduzca una etiqueta personalizada."; -$text['description-phone_label']['es-mx'] = "Seleccione o introduzca una etiqueta personalizada."; //copied from es-cl -$text['description-phone_label']['fr-ca'] = "Sélectionnez ou entrez une étiquette personnalisée."; //copied from fr-fr -$text['description-phone_label']['fr-fr'] = "Sélectionnez ou entrez une étiquette personnalisée."; -$text['description-phone_label']['he-il'] = ""; -$text['description-phone_label']['it-it'] = "Seleziona o inserisci un'etichetta personalizzata."; -$text['description-phone_label']['nl-nl'] = "Kies of voer een keuze kenmerk in."; -$text['description-phone_label']['pl-pl'] = "Wybierz lub wprowadź własną etykietę."; -$text['description-phone_label']['pt-br'] = "Selecione ou digite um identificador personalizado"; -$text['description-phone_label']['pt-pt'] = "Selecione ou digite um rótulo personalizado."; -$text['description-phone_label']['ro-ro'] = ""; -$text['description-phone_label']['ru-ru'] = "Выберите или введите настраиваемую метку."; -$text['description-phone_label']['sv-se'] = "Välj eller ange anpassad etikett."; -$text['description-phone_label']['uk-ua'] = ""; - $text['description-phone_extension']['en-us'] = "Enter the extension."; $text['description-phone_extension']['en-gb'] = "Enter the extension."; $text['description-phone_extension']['ar-eg'] = ""; @@ -4555,6 +4533,28 @@ $text['description-phone_extension']['ru-ru'] = "Введите Внутренн $text['description-phone_extension']['sv-se'] = "Ange anknytningen."; $text['description-phone_extension']['uk-ua'] = ""; +$text['description-phone_primary']['en-us'] = "Set as the primary Number for this contact."; +$text['description-phone_primary']['en-gb'] = "Set as the primary Number for this contact."; +$text['description-phone_primary']['ar-eg'] = ""; +$text['description-phone_primary']['de-at'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de +$text['description-phone_primary']['de-ch'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de +$text['description-phone_primary']['de-de'] = "Als primäre Nummer für diesen Kontakt setzen."; +$text['description-phone_primary']['el-gr'] = "Ορίστε τον κύριο αριθμό για αυτή την επαφή"; +$text['description-phone_primary']['es-cl'] = "Establecer como el número primario para este contacto."; +$text['description-phone_primary']['es-mx'] = "Establecer como el número primario para este contacto."; //copied from es-cl +$text['description-phone_primary']['fr-ca'] = "Définir comme primaire numéro pour ce contact."; //copied from fr-fr +$text['description-phone_primary']['fr-fr'] = "Définir comme primaire numéro pour ce contact."; +$text['description-phone_primary']['he-il'] = ""; +$text['description-phone_primary']['it-it'] = "Imposta come numero principale per questo contatto."; +$text['description-phone_primary']['nl-nl'] = "Stel nummer in als primair nummer voor dit kontact"; +$text['description-phone_primary']['pl-pl'] = "Ustaw jako podstawowy numer tego kontaktu."; +$text['description-phone_primary']['pt-br'] = "Defina número principal para este contato"; +$text['description-phone_primary']['pt-pt'] = "Definir como o principal número para este contato."; +$text['description-phone_primary']['ro-ro'] = ""; +$text['description-phone_primary']['ru-ru'] = "Укажите в качестве основного номера для этого контакта."; +$text['description-phone_primary']['sv-se'] = "Sätt som primärt Nummer för denna kontakt."; +$text['description-phone_primary']['uk-ua'] = ""; + $text['description-phone_description']['en-us'] = "Enter the description."; $text['description-phone_description']['en-gb'] = "Enter the description."; $text['description-phone_description']['ar-eg'] = ""; diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index 44c4033fe3..f0487a1d82 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -658,14 +658,14 @@ $contact_phones[$x]['contact_uuid'] = $contact_uuid; $contact_phones[$x]['contact_phone_uuid'] = uuid(); $contact_phones[$x]['phone_label'] = ''; - $contact_phones[$x]['phone_country_code'] = ''; - $contact_phones[$x]['phone_number'] = ''; - $contact_phones[$x]['phone_extension'] = ''; - $contact_phones[$x]['phone_speed_dial'] = ''; $contact_phones[$x]['phone_type_voice'] = ''; $contact_phones[$x]['phone_type_fax'] = ''; $contact_phones[$x]['phone_type_video'] = ''; $contact_phones[$x]['phone_type_text'] = ''; + $contact_phones[$x]['phone_speed_dial'] = ''; + $contact_phones[$x]['phone_country_code'] = ''; + $contact_phones[$x]['phone_number'] = ''; + $contact_phones[$x]['phone_extension'] = ''; $contact_phones[$x]['phone_primary'] = ''; $contact_phones[$x]['phone_description'] = ''; } diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php index 9f73f22d4a..938973ca7c 100644 --- a/app/contacts/contact_phone_edit.php +++ b/app/contacts/contact_phone_edit.php @@ -59,12 +59,12 @@ //get http post variables and set them to php variables if (is_array($_POST) && @sizeof($_POST) != 0) { + $phone_label = $_POST["phone_label"]; + $phone_label_custom = $_POST["phone_label_custom"]; $phone_type_voice = $_POST["phone_type_voice"]; $phone_type_fax = $_POST["phone_type_fax"]; $phone_type_video = $_POST["phone_type_video"]; $phone_type_text = $_POST["phone_type_text"]; - $phone_label = $_POST["phone_label"]; - $phone_label_custom = $_POST["phone_label_custom"]; $phone_speed_dial = $_POST["phone_speed_dial"]; $phone_country_code = $_POST["phone_country_code"]; $phone_number = $_POST["phone_number"]; @@ -161,11 +161,11 @@ if (is_array($array) && @sizeof($array) != 0) { $array['contact_phones'][0]['contact_uuid'] = $contact_uuid; $array['contact_phones'][0]['domain_uuid'] = $domain_uuid; + $array['contact_phones'][0]['phone_label'] = $phone_label; $array['contact_phones'][0]['phone_type_voice'] = $phone_type_voice ? 1 : null; $array['contact_phones'][0]['phone_type_fax'] = $phone_type_fax ? 1 : null; $array['contact_phones'][0]['phone_type_video'] = $phone_type_video ? 1 : null; $array['contact_phones'][0]['phone_type_text'] = $phone_type_text ? 1 : null; - $array['contact_phones'][0]['phone_label'] = $phone_label; $array['contact_phones'][0]['phone_speed_dial'] = $phone_speed_dial; $array['contact_phones'][0]['phone_country_code'] = $phone_country_code; $array['contact_phones'][0]['phone_number'] = $phone_number; @@ -198,11 +198,11 @@ $database = new database; $row = $database->select($sql, $parameters, 'row'); if (is_array($row) && @sizeof($row) != 0) { + $phone_label = $row["phone_label"]; $phone_type_voice = $row["phone_type_voice"]; $phone_type_fax = $row["phone_type_fax"]; $phone_type_video = $row["phone_type_video"]; $phone_type_text = $row["phone_type_text"]; - $phone_label = $row["phone_label"]; $phone_speed_dial = $row["phone_speed_dial"]; $phone_country_code = $row["phone_country_code"]; $phone_number = $row["phone_number"];