Skip to content

Commit

Permalink
Fixes #669 - Added '~~~' as separator if field has more then one value
Browse files Browse the repository at this point in the history
  • Loading branch information
ralf401 authored Oct 10, 2024
1 parent 920c267 commit 8cc4f9b
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 30 deletions.
42 changes: 23 additions & 19 deletions locale/admin-docs.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -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 ""

Expand Down Expand Up @@ -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 ""

Expand Down
12 changes: 4 additions & 8 deletions manage/organizations/via-csv-import.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,12 @@ For instance:
.. code-block:: none
name,shared,domain,domain_assignment,active,members
Chrispresso Inc.,true,"",false,true,[email protected]
"","","","","",[email protected]
"","","","","",[email protected]
Awesome Customer Inc.,true,"",false,true,[email protected]
"","","","","",[email protected]
"","","","","",[email protected]
Chrispresso Inc.,true,"",false,true,[email protected][email protected][email protected]
Awesome Customer Inc.,true,"",false,true,[email protected][email protected][email protected]
Zammad Foundation,true,"",false,true,[email protected]
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
----------------------------------
Expand Down
9 changes: 6 additions & 3 deletions manage/users/via-csv-import.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,12 @@ For instance:

.. code-block:: none
login,firstname,lastname,email,web,active
jdoe,"John","Doe",[email protected],"https://zammad.com",true
mmore,"Madeline","Moore",[email protected],"",false
login,firstname,lastname,email,web,active,roles
jdoe,John,Doe,[email protected],https://zammad.com,true,admin~~~agent
mmore,Madeline,Moore,[email protected],"",false,customer
If you have more than one value for a field, separate them with ``~~~`` as
above.

Step 3: Import Your .csv to Zammad
----------------------------------
Expand Down

0 comments on commit 8cc4f9b

Please sign in to comment.