From 8cc4f9ba8309fc2171af798b1366ea0483feafc0 Mon Sep 17 00:00:00 2001 From: ralf401 Date: Thu, 10 Oct 2024 13:09:26 +0200 Subject: [PATCH] Fixes #669 - Added '~~~' as separator if field has more then one value --- locale/admin-docs.pot | 42 ++++++++++++++----------- manage/organizations/via-csv-import.rst | 12 +++---- manage/users/via-csv-import.rst | 9 ++++-- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/locale/admin-docs.pot b/locale/admin-docs.pot index 6cea51a2..81ecf010 100644 --- a/locale/admin-docs.pot +++ b/locale/admin-docs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Zammad Admin Documentation pre-release\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-07 18:05+0200\n" +"POT-Creation-Date: 2024-10-10 11:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -6599,44 +6599,44 @@ msgstr "" msgid "For instance:" msgstr "" -#: ../manage/organizations/via-csv-import.rst:44 -msgid "Several *organization members* can be added: Ensure to provide the users email address as shown above with empty values." +#: ../manage/organizations/via-csv-import.rst:40 +msgid "Several *organization members* can be added. Separate multiple values for one field with ``~~~`` as above." msgstr "" -#: ../manage/organizations/via-csv-import.rst:48 -#: ../manage/users/via-csv-import.rst:45 +#: ../manage/organizations/via-csv-import.rst:44 +#: ../manage/users/via-csv-import.rst:48 msgid "Step 3: Import Your .csv to Zammad" msgstr "" -#: ../manage/organizations/via-csv-import.rst:50 +#: ../manage/organizations/via-csv-import.rst:46 msgid "Once your raw organization data has been submitted, Zammad will perform a test run to compute the number of affected records:" msgstr "" -#: ../manage/organizations/via-csv-import.rst:58 -#: ../manage/users/via-csv-import.rst:55 +#: ../manage/organizations/via-csv-import.rst:54 +#: ../manage/users/via-csv-import.rst:58 msgid "CSV import test run and confirmation dialog" msgstr "" -#: ../manage/organizations/via-csv-import.rst:58 -#: ../manage/users/via-csv-import.rst:55 +#: ../manage/organizations/via-csv-import.rst:54 +#: ../manage/users/via-csv-import.rst:58 msgid "CSV import always begins with a preview / test run." msgstr "" -#: ../manage/organizations/via-csv-import.rst:60 -#: ../manage/users/via-csv-import.rst:57 +#: ../manage/organizations/via-csv-import.rst:56 +#: ../manage/users/via-csv-import.rst:60 msgid "๐Ÿค” **How does it know when to create new records and when to update?**" msgstr "" -#: ../manage/organizations/via-csv-import.rst:62 +#: ../manage/organizations/via-csv-import.rst:58 msgid "Records are updated when the imported data contains a ``name`` that matches an existing organization entry." msgstr "" -#: ../manage/organizations/via-csv-import.rst:65 +#: ../manage/organizations/via-csv-import.rst:61 msgid "Click **Yes, start real import** to proceed. (If you're importing a lot of records, be patientโ€”it may take a minute.)" msgstr "" -#: ../manage/organizations/via-csv-import.rst:68 -#: ../manage/users/via-csv-import.rst:65 +#: ../manage/organizations/via-csv-import.rst:64 +#: ../manage/users/via-csv-import.rst:68 msgid "That's it! ๐ŸŽ‰๐ŸŽ‰๐ŸŽ‰" msgstr "" @@ -9834,15 +9834,19 @@ msgstr "" msgid "the ``firstname`` and ``lastname`` attributes are **required**; and" msgstr "" -#: ../manage/users/via-csv-import.rst:47 +#: ../manage/users/via-csv-import.rst:44 +msgid "If you have more than one value for a field, separate them with ``~~~`` as above." +msgstr "" + +#: ../manage/users/via-csv-import.rst:50 msgid "Once your raw user data has been submitted, Zammad will perform a test run to compute the number of affected records:" msgstr "" -#: ../manage/users/via-csv-import.rst:59 +#: ../manage/users/via-csv-import.rst:62 msgid "Records are updated when the imported data contains an ``email`` or ``login`` that matches an existing user account." msgstr "" -#: ../manage/users/via-csv-import.rst:62 +#: ../manage/users/via-csv-import.rst:65 msgid "Click **Yes, start real import** to proceed. (If you're importing a lot of records, be patient - it may take a minute.)" msgstr "" diff --git a/manage/organizations/via-csv-import.rst b/manage/organizations/via-csv-import.rst index b4ed718c..35f5149a 100644 --- a/manage/organizations/via-csv-import.rst +++ b/manage/organizations/via-csv-import.rst @@ -33,16 +33,12 @@ For instance: .. code-block:: none name,shared,domain,domain_assignment,active,members - Chrispresso Inc.,true,"",false,true,emma@chrispresso.com - "","","","","",jacob@chrispresso.com - "","","","","",chris@chrispresso.com - Awesome Customer Inc.,true,"",false,true,emily@example.com - "","","","","",samuel@example.com - "","","","","",anna@example.com + Chrispresso Inc.,true,"",false,true,emma@chrispresso.com~~~jacob@chrispresso.com~~~chris@chrispresso.com + Awesome Customer Inc.,true,"",false,true,emily@example.com~~~samuel@example.com~~~anna@example.com Zammad Foundation,true,"",false,true,nicole.braun@zammad.org -Several *organization members* can be added: Ensure to provide the users -email address as shown above with empty values. +Several *organization members* can be added. Separate multiple values for one +field with ``~~~`` as above. Step 3: Import Your .csv to Zammad ---------------------------------- diff --git a/manage/users/via-csv-import.rst b/manage/users/via-csv-import.rst index f91cf7ce..d14afc9d 100644 --- a/manage/users/via-csv-import.rst +++ b/manage/users/via-csv-import.rst @@ -37,9 +37,12 @@ For instance: .. code-block:: none - login,firstname,lastname,email,web,active - jdoe,"John","Doe",jdoe@example.com,"https://zammad.com",true - mmore,"Madeline","Moore",mmore@example.net,"",false + login,firstname,lastname,email,web,active,roles + jdoe,John,Doe,jdoe@example.com,https://zammad.com,true,admin~~~agent + mmore,Madeline,Moore,mmore@example.net,"",false,customer + +If you have more than one value for a field, separate them with ``~~~`` as +above. Step 3: Import Your .csv to Zammad ----------------------------------