diff --git a/core/handlers/msg_created_test.go b/core/handlers/msg_created_test.go index 26bc1eab0..bbbbcbcac 100644 --- a/core/handlers/msg_created_test.go +++ b/core/handlers/msg_created_test.go @@ -85,7 +85,7 @@ func TestMsgCreated(t *testing.T) { Args: []interface{}{ models.AlexandriaID, `Hi Alexandia, are you still experiencing problems with tooth?`, - `{"templating":{"template":{"uuid":"9c22b594-fcab-4b29-9bcb-ce4404894a80","name":"revive_issue"},"language":"eng","country":"US","variables":["Alexandia","tooth"],"namespace":""}}`, + `{"templating":{"template":{"uuid":"9c22b594-fcab-4b29-9bcb-ce4404894a80","name":"revive_issue"},"language":"eng","country":"US","variables":["Alexandia","tooth"],"namespace":"2d40b45c_25cd_4965_9019_f05d0124c5fa"}}`, models.TwitterChannelID, }, Count: 1, diff --git a/mailroom_test.dump b/mailroom_test.dump index 76dca8ed4..4e861a1fe 100644 Binary files a/mailroom_test.dump and b/mailroom_test.dump differ diff --git a/web/contact/testdata/resolve.json b/web/contact/testdata/resolve.json index 534a75a3b..abf1e2594 100644 --- a/web/contact/testdata/resolve.json +++ b/web/contact/testdata/resolve.json @@ -35,7 +35,7 @@ "name": "Bob", "status": "active", "timezone": "America/Los_Angeles", - "created_on": "2021-04-09T14:51:56.517774Z", + "created_on": "2021-05-11T12:36:54.721431Z", "urns": [ "tel:+16055742222?id=10001&priority=1000" ], diff --git a/web/po/testdata/favorites.po b/web/po/testdata/favorites.po index a9ffb4c2f..40f1ba995 100644 --- a/web/po/testdata/favorites.po +++ b/web/po/testdata/favorites.po @@ -10,88 +10,88 @@ msgstr "" "Language-3: \n" "Source-Flows: 9de3663f-c5c5-4c92-9f45-ecbc09abcc85\n" -#: Favorites/491f3ed1-9154-4acb-8fdd-0a37567e0574/name:0 +#: Favorites/e87aeeab-8ede-4173-bc76-8f5583ea7207/name:0 msgid "All Responses" msgstr "" -#: Favorites/34a421ac-34cb-49d8-a2a5-534f52c60851/name:0 -#: Favorites/baf07ebb-8a2a-4e63-aa08-d19aa408cd45/arguments:0 +#: Favorites/34a421ac-34cb-49d8-a2a5-534f52c60851/arguments:0 +#: Favorites/c102acfc-8cc5-41fa-89ed-41cbfa362ba6/name:0 msgid "Blue" msgstr "" -#: Favorites/3b400f91-db69-42b9-9fe2-24ad556b067a/name:0 -#: Favorites/6e367c0c-65ab-479a-82e3-c597d8e35eef/arguments:0 +#: Favorites/3b400f91-db69-42b9-9fe2-24ad556b067a/arguments:0 +#: Favorites/8d2e259c-bc3c-464f-8c15-985bc736e212/name:0 msgid "Cyan" msgstr "" -#: Favorites/7624633a-01a9-48f0-abca-957e7290df0a/text:0 +#: Favorites/3e2dcf45-ffc0-4197-b5ab-25ed974ea612/text:0 msgid "Good choice, I like @results.color.category_localized too! What is your favorite beer?" msgstr "" -#: Favorites/b0c29972-6fd4-485e-83c2-057a3f7a04da/name:0 -#: Favorites/c102acfc-8cc5-41fa-89ed-41cbfa362ba6/arguments:0 +#: Favorites/58284598-805a-4740-8966-dcb09e3b670a/name:0 +#: Favorites/b0c29972-6fd4-485e-83c2-057a3f7a04da/arguments:0 msgid "Green" msgstr "" -#: Favorites/9631dddf-0dd7-4310-b263-5f7cad4795e0/text:0 +#: Favorites/943f85bb-50bc-40c3-8d6f-57dbe34c87f7/text:0 msgid "I don't know that color. Try again." msgstr "" -#: Favorites/aac779a9-e2a6-4a11-9efa-9670e081a33a/text:0 +#: Favorites/4cadf512-1299-468f-85e4-26af9edec193/text:0 msgid "I don't know that one, try again please." msgstr "" -#: Favorites/ada3d96a-a1a2-41eb-aac7-febdb98a9b4c/text:0 +#: Favorites/52d7a9ab-52b7-4e82-ba7f-672fb8d6ec91/text:0 msgid "Mmmmm... delicious @results.beer.category_localized. If only they made @(lower(results.color)) @results.beer.category_localized! Lastly, what is your name?" msgstr "" -#: Favorites/a813de57-c92a-4128-804d-56e80b332142/name:0 -#: Favorites/b9d718d3-b5e0-4d26-998e-2da31b24f2f9/arguments:0 +#: Favorites/87b850ff-ddc5-4add-8a4f-c395c3a9ac38/name:0 +#: Favorites/a813de57-c92a-4128-804d-56e80b332142/arguments:0 msgid "Mutzig" msgstr "" -#: Favorites/8d2e259c-bc3c-464f-8c15-985bc736e212/arguments:0 +#: Favorites/baf07ebb-8a2a-4e63-aa08-d19aa408cd45/arguments:0 msgid "Navy" msgstr "" -#: Favorites/3e2dcf45-ffc0-4197-b5ab-25ed974ea612/name:0 +#: Favorites/6e367c0c-65ab-479a-82e3-c597d8e35eef/name:0 msgid "No Response" msgstr "" -#: Favorites/5563a722-9680-419c-a792-b1fa9df92e06/name:0 -#: Favorites/87b850ff-ddc5-4add-8a4f-c395c3a9ac38/name:0 +#: Favorites/c169352e-1944-4451-8d32-eb39c41cb3ae/name:0 +#: Favorites/e0ec2076-2746-43b4-a410-c3af47d6a121/name:0 msgid "Other" msgstr "" -#: Favorites/a03dceb1-7ac1-491d-93ef-23d3e099633b/name:0 -#: Favorites/f1ca9ac8-d0aa-4758-a969-195be7330267/arguments:0 +#: Favorites/a03dceb1-7ac1-491d-93ef-23d3e099633b/arguments:0 +#: Favorites/b9d718d3-b5e0-4d26-998e-2da31b24f2f9/name:0 msgid "Primus" msgstr "" -#: Favorites/3ffb6f24-2ed8-4fd5-bcc0-b2e2668672a8/name:0 -#: Favorites/58284598-805a-4740-8966-dcb09e3b670a/arguments:0 +#: Favorites/3ffb6f24-2ed8-4fd5-bcc0-b2e2668672a8/arguments:0 +#: Favorites/5563a722-9680-419c-a792-b1fa9df92e06/name:0 msgid "Red" msgstr "" -#: Favorites/2ba89eb6-6981-4c0d-a19d-3cf1fde52a43/name:0 -#: Favorites/52d7a9ab-52b7-4e82-ba7f-672fb8d6ec91/arguments:0 +#: Favorites/2ba89eb6-6981-4c0d-a19d-3cf1fde52a43/arguments:0 +#: Favorites/dbc3b9d2-e6ce-4ebe-9552-8ddce482c1d1/name:0 msgid "Skol" msgstr "" -#: Favorites/cb6fc9b4-d6e9-4ed3-8a11-3f4d19654a48/text:0 +#: Favorites/e92b12c5-1817-468e-aa2f-8791fb6247e9/text:0 msgid "Sorry you can't participate right now, I'll try again later." msgstr "" -#: Favorites/a602e75e-0814-4034-bb95-770906ddfe34/text:0 +#: Favorites/491f3ed1-9154-4acb-8fdd-0a37567e0574/text:0 msgid "Thanks @results.name, we are all done!" msgstr "" -#: Favorites/58119801-ed31-4538-888d-23779a01707f/name:0 -#: Favorites/dbc3b9d2-e6ce-4ebe-9552-8ddce482c1d1/arguments:0 +#: Favorites/58119801-ed31-4538-888d-23779a01707f/arguments:0 +#: Favorites/f1ca9ac8-d0aa-4758-a969-195be7330267/name:0 msgid "Turbo King" msgstr "" -#: Favorites/f4495f19-37ee-4e51-a7d5-d99ef6be147a/text:0 +#: Favorites/8c2504ef-0acc-405f-9efe-d5fc2c434a93/text:0 msgid "What is your favorite color?" msgstr "" diff --git a/web/po/testdata/import.json b/web/po/testdata/import.json index d7b9988a9..e084398b5 100644 --- a/web/po/testdata/import.json +++ b/web/po/testdata/import.json @@ -46,12 +46,12 @@ "localization": { "spa": { "34a421ac-34cb-49d8-a2a5-534f52c60851": { - "name": [ + "arguments": [ "Azul" ] }, - "baf07ebb-8a2a-4e63-aa08-d19aa408cd45": { - "arguments": [ + "c102acfc-8cc5-41fa-89ed-41cbfa362ba6": { + "name": [ "Azul" ] } @@ -59,186 +59,186 @@ }, "nodes": [ { - "uuid": "10c9c241-777f-4010-a841-6e87abed8520", + "uuid": "b4664fbd-3495-4fc6-aa8b-b397857dcd68", "actions": [ { "type": "send_msg", - "uuid": "f4495f19-37ee-4e51-a7d5-d99ef6be147a", + "uuid": "8c2504ef-0acc-405f-9efe-d5fc2c434a93", "text": "What is your favorite color?" } ], "exits": [ { - "uuid": "943f85bb-50bc-40c3-8d6f-57dbe34c87f7", - "destination_uuid": "5253c207-46e8-42a9-998e-a3e54e0e0542" + "uuid": "f4495f19-37ee-4e51-a7d5-d99ef6be147a", + "destination_uuid": "10c9c241-777f-4010-a841-6e87abed8520" } ] }, { - "uuid": "8c2504ef-0acc-405f-9efe-d5fc2c434a93", + "uuid": "1b828e78-e478-4357-9472-47a30ec1f60b", "actions": [ { "type": "send_msg", - "uuid": "9631dddf-0dd7-4310-b263-5f7cad4795e0", + "uuid": "943f85bb-50bc-40c3-8d6f-57dbe34c87f7", "text": "I don't know that color. Try again." } ], "exits": [ { - "uuid": "66c38ec3-0acd-4bf7-a5d5-278af1bee492", - "destination_uuid": "5253c207-46e8-42a9-998e-a3e54e0e0542" + "uuid": "9631dddf-0dd7-4310-b263-5f7cad4795e0", + "destination_uuid": "10c9c241-777f-4010-a841-6e87abed8520" } ] }, { - "uuid": "5253c207-46e8-42a9-998e-a3e54e0e0542", + "uuid": "10c9c241-777f-4010-a841-6e87abed8520", "router": { "type": "switch", "wait": { "type": "msg", "timeout": { "seconds": 300, - "category_uuid": "3e2dcf45-ffc0-4197-b5ab-25ed974ea612" + "category_uuid": "6e367c0c-65ab-479a-82e3-c597d8e35eef" } }, "result_name": "Color", "categories": [ { - "uuid": "3ffb6f24-2ed8-4fd5-bcc0-b2e2668672a8", + "uuid": "5563a722-9680-419c-a792-b1fa9df92e06", "name": "Red", - "exit_uuid": "eb048bdf-17ee-4334-a52b-5e82a20189ac" + "exit_uuid": "66c38ec3-0acd-4bf7-a5d5-278af1bee492" }, { - "uuid": "b0c29972-6fd4-485e-83c2-057a3f7a04da", + "uuid": "58284598-805a-4740-8966-dcb09e3b670a", "name": "Green", - "exit_uuid": "1349bebf-4653-407a-ad25-9fa60e7d7464" + "exit_uuid": "eb048bdf-17ee-4334-a52b-5e82a20189ac" }, { - "uuid": "34a421ac-34cb-49d8-a2a5-534f52c60851", + "uuid": "c102acfc-8cc5-41fa-89ed-41cbfa362ba6", "name": "Blue", - "exit_uuid": "37491e99-f4d3-40ae-9ed1-bff62b0e2529" + "exit_uuid": "1349bebf-4653-407a-ad25-9fa60e7d7464" }, { - "uuid": "3b400f91-db69-42b9-9fe2-24ad556b067a", + "uuid": "8d2e259c-bc3c-464f-8c15-985bc736e212", "name": "Cyan", - "exit_uuid": "456e75bd-32cc-40c1-a5ef-ffef2e57642c" + "exit_uuid": "37491e99-f4d3-40ae-9ed1-bff62b0e2529" }, { - "uuid": "5563a722-9680-419c-a792-b1fa9df92e06", + "uuid": "c169352e-1944-4451-8d32-eb39c41cb3ae", "name": "Other", - "exit_uuid": "405cf157-1e43-46d8-a0d1-49adcb539267" + "exit_uuid": "456e75bd-32cc-40c1-a5ef-ffef2e57642c" }, { - "uuid": "3e2dcf45-ffc0-4197-b5ab-25ed974ea612", + "uuid": "6e367c0c-65ab-479a-82e3-c597d8e35eef", "name": "No Response", - "exit_uuid": "c169352e-1944-4451-8d32-eb39c41cb3ae" + "exit_uuid": "405cf157-1e43-46d8-a0d1-49adcb539267" } ], "operand": "@input", "cases": [ { - "uuid": "58284598-805a-4740-8966-dcb09e3b670a", + "uuid": "3ffb6f24-2ed8-4fd5-bcc0-b2e2668672a8", "type": "has_any_word", "arguments": [ "Red" ], - "category_uuid": "3ffb6f24-2ed8-4fd5-bcc0-b2e2668672a8" + "category_uuid": "5563a722-9680-419c-a792-b1fa9df92e06" }, { - "uuid": "c102acfc-8cc5-41fa-89ed-41cbfa362ba6", + "uuid": "b0c29972-6fd4-485e-83c2-057a3f7a04da", "type": "has_any_word", "arguments": [ "Green" ], - "category_uuid": "b0c29972-6fd4-485e-83c2-057a3f7a04da" + "category_uuid": "58284598-805a-4740-8966-dcb09e3b670a" }, { - "uuid": "baf07ebb-8a2a-4e63-aa08-d19aa408cd45", + "uuid": "34a421ac-34cb-49d8-a2a5-534f52c60851", "type": "has_any_word", "arguments": [ "Blue" ], - "category_uuid": "34a421ac-34cb-49d8-a2a5-534f52c60851" + "category_uuid": "c102acfc-8cc5-41fa-89ed-41cbfa362ba6" }, { - "uuid": "8d2e259c-bc3c-464f-8c15-985bc736e212", + "uuid": "baf07ebb-8a2a-4e63-aa08-d19aa408cd45", "type": "has_any_word", "arguments": [ "Navy" ], - "category_uuid": "34a421ac-34cb-49d8-a2a5-534f52c60851" + "category_uuid": "c102acfc-8cc5-41fa-89ed-41cbfa362ba6" }, { - "uuid": "6e367c0c-65ab-479a-82e3-c597d8e35eef", + "uuid": "3b400f91-db69-42b9-9fe2-24ad556b067a", "type": "has_any_word", "arguments": [ "Cyan" ], - "category_uuid": "3b400f91-db69-42b9-9fe2-24ad556b067a" + "category_uuid": "8d2e259c-bc3c-464f-8c15-985bc736e212" } ], - "default_category_uuid": "5563a722-9680-419c-a792-b1fa9df92e06" + "default_category_uuid": "c169352e-1944-4451-8d32-eb39c41cb3ae" }, "exits": [ + { + "uuid": "66c38ec3-0acd-4bf7-a5d5-278af1bee492", + "destination_uuid": "5253c207-46e8-42a9-998e-a3e54e0e0542" + }, { "uuid": "eb048bdf-17ee-4334-a52b-5e82a20189ac", - "destination_uuid": "333fa9a0-85a3-47c5-817e-153a1a124991" + "destination_uuid": "5253c207-46e8-42a9-998e-a3e54e0e0542" }, { "uuid": "1349bebf-4653-407a-ad25-9fa60e7d7464", - "destination_uuid": "333fa9a0-85a3-47c5-817e-153a1a124991" + "destination_uuid": "5253c207-46e8-42a9-998e-a3e54e0e0542" }, { - "uuid": "37491e99-f4d3-40ae-9ed1-bff62b0e2529", - "destination_uuid": "333fa9a0-85a3-47c5-817e-153a1a124991" + "uuid": "37491e99-f4d3-40ae-9ed1-bff62b0e2529" }, { - "uuid": "456e75bd-32cc-40c1-a5ef-ffef2e57642c" + "uuid": "456e75bd-32cc-40c1-a5ef-ffef2e57642c", + "destination_uuid": "1b828e78-e478-4357-9472-47a30ec1f60b" }, { "uuid": "405cf157-1e43-46d8-a0d1-49adcb539267", - "destination_uuid": "8c2504ef-0acc-405f-9efe-d5fc2c434a93" - }, - { - "uuid": "c169352e-1944-4451-8d32-eb39c41cb3ae", - "destination_uuid": "1b828e78-e478-4357-9472-47a30ec1f60b" + "destination_uuid": "b0ae4ad9-5def-4778-8b0a-818d0f4bd3cf" } ] }, { - "uuid": "333fa9a0-85a3-47c5-817e-153a1a124991", + "uuid": "5253c207-46e8-42a9-998e-a3e54e0e0542", "actions": [ { "type": "send_msg", - "uuid": "7624633a-01a9-48f0-abca-957e7290df0a", + "uuid": "3e2dcf45-ffc0-4197-b5ab-25ed974ea612", "text": "Good choice, I like @results.color.category_localized too! What is your favorite beer?" } ], "exits": [ { - "uuid": "4cadf512-1299-468f-85e4-26af9edec193", - "destination_uuid": "a84399b1-0e7b-42ee-8759-473137b510db" + "uuid": "7624633a-01a9-48f0-abca-957e7290df0a", + "destination_uuid": "48f2ecb3-8e8e-4f7b-9510-1ee08bd6a434" } ] }, { - "uuid": "48f2ecb3-8e8e-4f7b-9510-1ee08bd6a434", + "uuid": "48fd5325-d660-4404-bdf3-05ad1b024cc0", "actions": [ { "type": "send_msg", - "uuid": "aac779a9-e2a6-4a11-9efa-9670e081a33a", + "uuid": "4cadf512-1299-468f-85e4-26af9edec193", "text": "I don't know that one, try again please." } ], "exits": [ { - "uuid": "0f0e66a8-9062-444f-b636-3d5374466e31", - "destination_uuid": "a84399b1-0e7b-42ee-8759-473137b510db" + "uuid": "aac779a9-e2a6-4a11-9efa-9670e081a33a", + "destination_uuid": "48f2ecb3-8e8e-4f7b-9510-1ee08bd6a434" } ] }, { - "uuid": "a84399b1-0e7b-42ee-8759-473137b510db", + "uuid": "48f2ecb3-8e8e-4f7b-9510-1ee08bd6a434", "router": { "type": "switch", "wait": { @@ -247,109 +247,109 @@ "result_name": "Beer", "categories": [ { - "uuid": "a813de57-c92a-4128-804d-56e80b332142", + "uuid": "87b850ff-ddc5-4add-8a4f-c395c3a9ac38", "name": "Mutzig", - "exit_uuid": "0891f63c-9e82-42bb-a815-8b44aff33046" + "exit_uuid": "0f0e66a8-9062-444f-b636-3d5374466e31" }, { - "uuid": "a03dceb1-7ac1-491d-93ef-23d3e099633b", + "uuid": "b9d718d3-b5e0-4d26-998e-2da31b24f2f9", "name": "Primus", - "exit_uuid": "b341b58e-58fe-41bf-b26e-6274765ccc0e" + "exit_uuid": "0891f63c-9e82-42bb-a815-8b44aff33046" }, { - "uuid": "58119801-ed31-4538-888d-23779a01707f", + "uuid": "f1ca9ac8-d0aa-4758-a969-195be7330267", "name": "Turbo King", - "exit_uuid": "e4697b6f-12a9-47ae-a927-96d95d9f8f77" + "exit_uuid": "b341b58e-58fe-41bf-b26e-6274765ccc0e" }, { - "uuid": "2ba89eb6-6981-4c0d-a19d-3cf1fde52a43", + "uuid": "dbc3b9d2-e6ce-4ebe-9552-8ddce482c1d1", "name": "Skol", - "exit_uuid": "d03c8f97-9f3b-4a6a-8ba9-bdc82a6f09b8" + "exit_uuid": "e4697b6f-12a9-47ae-a927-96d95d9f8f77" }, { - "uuid": "87b850ff-ddc5-4add-8a4f-c395c3a9ac38", + "uuid": "e0ec2076-2746-43b4-a410-c3af47d6a121", "name": "Other", - "exit_uuid": "e0ec2076-2746-43b4-a410-c3af47d6a121" + "exit_uuid": "d03c8f97-9f3b-4a6a-8ba9-bdc82a6f09b8" } ], "operand": "@input", "cases": [ { - "uuid": "b9d718d3-b5e0-4d26-998e-2da31b24f2f9", + "uuid": "a813de57-c92a-4128-804d-56e80b332142", "type": "has_any_word", "arguments": [ "Mutzig" ], - "category_uuid": "a813de57-c92a-4128-804d-56e80b332142" + "category_uuid": "87b850ff-ddc5-4add-8a4f-c395c3a9ac38" }, { - "uuid": "f1ca9ac8-d0aa-4758-a969-195be7330267", + "uuid": "a03dceb1-7ac1-491d-93ef-23d3e099633b", "type": "has_any_word", "arguments": [ "Primus" ], - "category_uuid": "a03dceb1-7ac1-491d-93ef-23d3e099633b" + "category_uuid": "b9d718d3-b5e0-4d26-998e-2da31b24f2f9" }, { - "uuid": "dbc3b9d2-e6ce-4ebe-9552-8ddce482c1d1", + "uuid": "58119801-ed31-4538-888d-23779a01707f", "type": "has_any_word", "arguments": [ "Turbo King" ], - "category_uuid": "58119801-ed31-4538-888d-23779a01707f" + "category_uuid": "f1ca9ac8-d0aa-4758-a969-195be7330267" }, { - "uuid": "52d7a9ab-52b7-4e82-ba7f-672fb8d6ec91", + "uuid": "2ba89eb6-6981-4c0d-a19d-3cf1fde52a43", "type": "has_any_word", "arguments": [ "Skol" ], - "category_uuid": "2ba89eb6-6981-4c0d-a19d-3cf1fde52a43" + "category_uuid": "dbc3b9d2-e6ce-4ebe-9552-8ddce482c1d1" } ], - "default_category_uuid": "87b850ff-ddc5-4add-8a4f-c395c3a9ac38" + "default_category_uuid": "e0ec2076-2746-43b4-a410-c3af47d6a121" }, "exits": [ + { + "uuid": "0f0e66a8-9062-444f-b636-3d5374466e31", + "destination_uuid": "333fa9a0-85a3-47c5-817e-153a1a124991" + }, { "uuid": "0891f63c-9e82-42bb-a815-8b44aff33046", - "destination_uuid": "48fd5325-d660-4404-bdf3-05ad1b024cc0" + "destination_uuid": "333fa9a0-85a3-47c5-817e-153a1a124991" }, { "uuid": "b341b58e-58fe-41bf-b26e-6274765ccc0e", - "destination_uuid": "48fd5325-d660-4404-bdf3-05ad1b024cc0" + "destination_uuid": "333fa9a0-85a3-47c5-817e-153a1a124991" }, { "uuid": "e4697b6f-12a9-47ae-a927-96d95d9f8f77", - "destination_uuid": "48fd5325-d660-4404-bdf3-05ad1b024cc0" + "destination_uuid": "333fa9a0-85a3-47c5-817e-153a1a124991" }, { "uuid": "d03c8f97-9f3b-4a6a-8ba9-bdc82a6f09b8", "destination_uuid": "48fd5325-d660-4404-bdf3-05ad1b024cc0" - }, - { - "uuid": "e0ec2076-2746-43b4-a410-c3af47d6a121", - "destination_uuid": "48f2ecb3-8e8e-4f7b-9510-1ee08bd6a434" } ] }, { - "uuid": "48fd5325-d660-4404-bdf3-05ad1b024cc0", + "uuid": "333fa9a0-85a3-47c5-817e-153a1a124991", "actions": [ { "type": "send_msg", - "uuid": "ada3d96a-a1a2-41eb-aac7-febdb98a9b4c", + "uuid": "52d7a9ab-52b7-4e82-ba7f-672fb8d6ec91", "text": "Mmmmm... delicious @results.beer.category_localized. If only they made @(lower(results.color)) @results.beer.category_localized! Lastly, what is your name?" } ], "exits": [ { - "uuid": "fc551cb4-e797-4076-b40a-433c44ad492b", - "destination_uuid": "b0ae4ad9-5def-4778-8b0a-818d0f4bd3cf" + "uuid": "ada3d96a-a1a2-41eb-aac7-febdb98a9b4c", + "destination_uuid": "a84399b1-0e7b-42ee-8759-473137b510db" } ] }, { - "uuid": "b0ae4ad9-5def-4778-8b0a-818d0f4bd3cf", + "uuid": "a84399b1-0e7b-42ee-8759-473137b510db", "router": { "type": "switch", "wait": { @@ -358,49 +358,49 @@ "result_name": "Name", "categories": [ { - "uuid": "491f3ed1-9154-4acb-8fdd-0a37567e0574", + "uuid": "e87aeeab-8ede-4173-bc76-8f5583ea7207", "name": "All Responses", - "exit_uuid": "e87aeeab-8ede-4173-bc76-8f5583ea7207" + "exit_uuid": "fc551cb4-e797-4076-b40a-433c44ad492b" } ], "operand": "@input", "cases": [], - "default_category_uuid": "491f3ed1-9154-4acb-8fdd-0a37567e0574" + "default_category_uuid": "e87aeeab-8ede-4173-bc76-8f5583ea7207" }, "exits": [ { - "uuid": "e87aeeab-8ede-4173-bc76-8f5583ea7207", - "destination_uuid": "b4664fbd-3495-4fc6-aa8b-b397857dcd68" + "uuid": "fc551cb4-e797-4076-b40a-433c44ad492b", + "destination_uuid": "5456940a-d3f7-481a-bffe-debdb02c2108" } ] }, { - "uuid": "b4664fbd-3495-4fc6-aa8b-b397857dcd68", + "uuid": "5456940a-d3f7-481a-bffe-debdb02c2108", "actions": [ { "type": "send_msg", - "uuid": "a602e75e-0814-4034-bb95-770906ddfe34", + "uuid": "491f3ed1-9154-4acb-8fdd-0a37567e0574", "text": "Thanks @results.name, we are all done!" } ], "exits": [ { - "uuid": "e92b12c5-1817-468e-aa2f-8791fb6247e9" + "uuid": "a602e75e-0814-4034-bb95-770906ddfe34" } ] }, { - "uuid": "1b828e78-e478-4357-9472-47a30ec1f60b", + "uuid": "b0ae4ad9-5def-4778-8b0a-818d0f4bd3cf", "actions": [ { "type": "send_msg", - "uuid": "cb6fc9b4-d6e9-4ed3-8a11-3f4d19654a48", + "uuid": "e92b12c5-1817-468e-aa2f-8791fb6247e9", "text": "Sorry you can't participate right now, I'll try again later." } ], "exits": [ { - "uuid": "1470d5e6-08dd-479b-a207-9b2b27b924d3" + "uuid": "cb6fc9b4-d6e9-4ed3-8a11-3f4d19654a48" } ] } @@ -408,73 +408,73 @@ "_ui": { "nodes": { "10c9c241-777f-4010-a841-6e87abed8520": { - "type": "execute_actions", + "type": "wait_for_response", "position": { - "top": 0, - "left": 100 + "top": 129, + "left": 98 } }, "1b828e78-e478-4357-9472-47a30ec1f60b": { "type": "execute_actions", "position": { - "top": 1278, - "left": 752 + "top": 8, + "left": 456 } }, "333fa9a0-85a3-47c5-817e-153a1a124991": { "type": "execute_actions", "position": { - "top": 237, - "left": 131 + "top": 535, + "left": 191 } }, "48f2ecb3-8e8e-4f7b-9510-1ee08bd6a434": { - "type": "execute_actions", + "type": "wait_for_response", "position": { - "top": 265, - "left": 512 + "top": 387, + "left": 112 } }, "48fd5325-d660-4404-bdf3-05ad1b024cc0": { "type": "execute_actions", "position": { - "top": 535, - "left": 191 + "top": 265, + "left": 512 } }, "5253c207-46e8-42a9-998e-a3e54e0e0542": { - "type": "wait_for_response", + "type": "execute_actions", "position": { - "top": 129, - "left": 98 + "top": 237, + "left": 131 } }, - "8c2504ef-0acc-405f-9efe-d5fc2c434a93": { + "5456940a-d3f7-481a-bffe-debdb02c2108": { "type": "execute_actions", "position": { - "top": 8, - "left": 456 + "top": 805, + "left": 191 } }, "a84399b1-0e7b-42ee-8759-473137b510db": { "type": "wait_for_response", "position": { - "top": 387, - "left": 112 + "top": 702, + "left": 191 } }, "b0ae4ad9-5def-4778-8b0a-818d0f4bd3cf": { - "type": "wait_for_response", + "type": "execute_actions", "position": { - "top": 702, - "left": 191 + "top": 1278, + "left": 752 } }, "b4664fbd-3495-4fc6-aa8b-b397857dcd68": { "type": "execute_actions", "position": { - "top": 805, - "left": 191 + "top": 0, + "left": 100 } } }, @@ -483,5 +483,6 @@ } ] } + } ] \ No newline at end of file diff --git a/web/po/testdata/multiple_flows.es.po b/web/po/testdata/multiple_flows.es.po index 802df8126..0c6e6159a 100644 --- a/web/po/testdata/multiple_flows.es.po +++ b/web/po/testdata/multiple_flows.es.po @@ -10,110 +10,110 @@ msgstr "" "Language-3: spa\n" "Source-Flows: 9de3663f-c5c5-4c92-9f45-ecbc09abcc85; 5890fe3a-f204-4661-b74d-025be4ee019c\n" -#: Pick+a+Number/f90c9734-3e58-4c07-96cc-315266c8ecfd/arguments:0 +#: Pick+a+Number/f3087862-dca9-4eaf-8cea-13f85cb52353/arguments:0 msgid "1" msgstr "" -#: Pick+a+Number/f3087862-dca9-4eaf-8cea-13f85cb52353/name:0 +#: Pick+a+Number/0d15ae52-5ad9-4d64-9c64-e27545d48a19/name:0 msgid "1-10" msgstr "" -#: Pick+a+Number/f90c9734-3e58-4c07-96cc-315266c8ecfd/arguments:1 +#: Pick+a+Number/f3087862-dca9-4eaf-8cea-13f85cb52353/arguments:1 msgid "10" msgstr "" -#: Favorites/491f3ed1-9154-4acb-8fdd-0a37567e0574/name:0 -#: Pick+a+Number/5bf24536-9ae1-466a-9b76-5c82626d3153/name:0 +#: Favorites/e87aeeab-8ede-4173-bc76-8f5583ea7207/name:0 +#: Pick+a+Number/225915f1-fb26-48a5-b457-d2ea4300b575/name:0 msgid "All Responses" msgstr "" -#: Favorites/34a421ac-34cb-49d8-a2a5-534f52c60851/name:0 -#: Favorites/baf07ebb-8a2a-4e63-aa08-d19aa408cd45/arguments:0 +#: Favorites/34a421ac-34cb-49d8-a2a5-534f52c60851/arguments:0 +#: Favorites/c102acfc-8cc5-41fa-89ed-41cbfa362ba6/name:0 msgid "Blue" msgstr "" -#: Favorites/3b400f91-db69-42b9-9fe2-24ad556b067a/name:0 -#: Favorites/6e367c0c-65ab-479a-82e3-c597d8e35eef/arguments:0 +#: Favorites/3b400f91-db69-42b9-9fe2-24ad556b067a/arguments:0 +#: Favorites/8d2e259c-bc3c-464f-8c15-985bc736e212/name:0 msgid "Cyan" msgstr "" -#: Favorites/7624633a-01a9-48f0-abca-957e7290df0a/text:0 +#: Favorites/3e2dcf45-ffc0-4197-b5ab-25ed974ea612/text:0 msgid "Good choice, I like @results.color.category_localized too! What is your favorite beer?" msgstr "" -#: Favorites/b0c29972-6fd4-485e-83c2-057a3f7a04da/name:0 -#: Favorites/c102acfc-8cc5-41fa-89ed-41cbfa362ba6/arguments:0 +#: Favorites/58284598-805a-4740-8966-dcb09e3b670a/name:0 +#: Favorites/b0c29972-6fd4-485e-83c2-057a3f7a04da/arguments:0 msgid "Green" msgstr "" -#: Favorites/9631dddf-0dd7-4310-b263-5f7cad4795e0/text:0 +#: Favorites/943f85bb-50bc-40c3-8d6f-57dbe34c87f7/text:0 msgid "I don't know that color. Try again." msgstr "" -#: Favorites/aac779a9-e2a6-4a11-9efa-9670e081a33a/text:0 +#: Favorites/4cadf512-1299-468f-85e4-26af9edec193/text:0 msgid "I don't know that one, try again please." msgstr "" -#: Favorites/ada3d96a-a1a2-41eb-aac7-febdb98a9b4c/text:0 +#: Favorites/52d7a9ab-52b7-4e82-ba7f-672fb8d6ec91/text:0 msgid "Mmmmm... delicious @results.beer.category_localized. If only they made @(lower(results.color)) @results.beer.category_localized! Lastly, what is your name?" msgstr "" -#: Favorites/a813de57-c92a-4128-804d-56e80b332142/name:0 -#: Favorites/b9d718d3-b5e0-4d26-998e-2da31b24f2f9/arguments:0 +#: Favorites/87b850ff-ddc5-4add-8a4f-c395c3a9ac38/name:0 +#: Favorites/a813de57-c92a-4128-804d-56e80b332142/arguments:0 msgid "Mutzig" msgstr "" -#: Favorites/8d2e259c-bc3c-464f-8c15-985bc736e212/arguments:0 +#: Favorites/baf07ebb-8a2a-4e63-aa08-d19aa408cd45/arguments:0 msgid "Navy" msgstr "" -#: Favorites/3e2dcf45-ffc0-4197-b5ab-25ed974ea612/name:0 +#: Favorites/6e367c0c-65ab-479a-82e3-c597d8e35eef/name:0 msgid "No Response" msgstr "" -#: Favorites/5563a722-9680-419c-a792-b1fa9df92e06/name:0 -#: Favorites/87b850ff-ddc5-4add-8a4f-c395c3a9ac38/name:0 -#: Pick+a+Number/0d15ae52-5ad9-4d64-9c64-e27545d48a19/name:0 +#: Favorites/c169352e-1944-4451-8d32-eb39c41cb3ae/name:0 +#: Favorites/e0ec2076-2746-43b4-a410-c3af47d6a121/name:0 +#: Pick+a+Number/34ef666f-24a0-41cc-b364-e8b08a6e89ff/name:0 msgid "Other" msgstr "" -#: Pick+a+Number/bb3276d9-543b-427b-9d00-a926dabc8e24/text:0 +#: Pick+a+Number/a39e1d4b-ceda-45e5-b889-11ddcbc77fde/text:0 msgid "Pick a number between 1-10." msgstr "" -#: Favorites/a03dceb1-7ac1-491d-93ef-23d3e099633b/name:0 -#: Favorites/f1ca9ac8-d0aa-4758-a969-195be7330267/arguments:0 +#: Favorites/a03dceb1-7ac1-491d-93ef-23d3e099633b/arguments:0 +#: Favorites/b9d718d3-b5e0-4d26-998e-2da31b24f2f9/name:0 msgid "Primus" msgstr "" -#: Favorites/3ffb6f24-2ed8-4fd5-bcc0-b2e2668672a8/name:0 -#: Favorites/58284598-805a-4740-8966-dcb09e3b670a/arguments:0 +#: Favorites/3ffb6f24-2ed8-4fd5-bcc0-b2e2668672a8/arguments:0 +#: Favorites/5563a722-9680-419c-a792-b1fa9df92e06/name:0 msgid "Red" msgstr "" -#: Favorites/2ba89eb6-6981-4c0d-a19d-3cf1fde52a43/name:0 -#: Favorites/52d7a9ab-52b7-4e82-ba7f-672fb8d6ec91/arguments:0 +#: Favorites/2ba89eb6-6981-4c0d-a19d-3cf1fde52a43/arguments:0 +#: Favorites/dbc3b9d2-e6ce-4ebe-9552-8ddce482c1d1/name:0 msgid "Skol" msgstr "" -#: Favorites/cb6fc9b4-d6e9-4ed3-8a11-3f4d19654a48/text:0 +#: Favorites/e92b12c5-1817-468e-aa2f-8791fb6247e9/text:0 msgid "Sorry you can't participate right now, I'll try again later." msgstr "" -#: Favorites/a602e75e-0814-4034-bb95-770906ddfe34/text:0 +#: Favorites/491f3ed1-9154-4acb-8fdd-0a37567e0574/text:0 msgid "Thanks @results.name, we are all done!" msgstr "" -#: Favorites/58119801-ed31-4538-888d-23779a01707f/name:0 -#: Favorites/dbc3b9d2-e6ce-4ebe-9552-8ddce482c1d1/arguments:0 +#: Favorites/58119801-ed31-4538-888d-23779a01707f/arguments:0 +#: Favorites/f1ca9ac8-d0aa-4758-a969-195be7330267/name:0 msgid "Turbo King" msgstr "" -#: Favorites/f4495f19-37ee-4e51-a7d5-d99ef6be147a/text:0 +#: Favorites/8c2504ef-0acc-405f-9efe-d5fc2c434a93/text:0 msgid "What is your favorite color?" msgstr "" -#: Pick+a+Number/b634f07f-7b2d-47bd-8795-051e56cf2609/text:0 +#: Pick+a+Number/f90c9734-3e58-4c07-96cc-315266c8ecfd/text:0 msgid "You picked @results.number!" msgstr "" diff --git a/web/po/testdata/multiple_flows_noargs.es.po b/web/po/testdata/multiple_flows_noargs.es.po index 81d0a3ea4..c54321a08 100644 --- a/web/po/testdata/multiple_flows_noargs.es.po +++ b/web/po/testdata/multiple_flows_noargs.es.po @@ -10,90 +10,90 @@ msgstr "" "Language-3: spa\n" "Source-Flows: 9de3663f-c5c5-4c92-9f45-ecbc09abcc85; 5890fe3a-f204-4661-b74d-025be4ee019c\n" -#: Pick+a+Number/f3087862-dca9-4eaf-8cea-13f85cb52353/name:0 +#: Pick+a+Number/0d15ae52-5ad9-4d64-9c64-e27545d48a19/name:0 msgid "1-10" msgstr "" -#: Favorites/491f3ed1-9154-4acb-8fdd-0a37567e0574/name:0 -#: Pick+a+Number/5bf24536-9ae1-466a-9b76-5c82626d3153/name:0 +#: Favorites/e87aeeab-8ede-4173-bc76-8f5583ea7207/name:0 +#: Pick+a+Number/225915f1-fb26-48a5-b457-d2ea4300b575/name:0 msgid "All Responses" msgstr "" -#: Favorites/34a421ac-34cb-49d8-a2a5-534f52c60851/name:0 +#: Favorites/c102acfc-8cc5-41fa-89ed-41cbfa362ba6/name:0 msgid "Blue" msgstr "" -#: Favorites/3b400f91-db69-42b9-9fe2-24ad556b067a/name:0 +#: Favorites/8d2e259c-bc3c-464f-8c15-985bc736e212/name:0 msgid "Cyan" msgstr "" -#: Favorites/7624633a-01a9-48f0-abca-957e7290df0a/text:0 +#: Favorites/3e2dcf45-ffc0-4197-b5ab-25ed974ea612/text:0 msgid "Good choice, I like @results.color.category_localized too! What is your favorite beer?" msgstr "" -#: Favorites/b0c29972-6fd4-485e-83c2-057a3f7a04da/name:0 +#: Favorites/58284598-805a-4740-8966-dcb09e3b670a/name:0 msgid "Green" msgstr "" -#: Favorites/9631dddf-0dd7-4310-b263-5f7cad4795e0/text:0 +#: Favorites/943f85bb-50bc-40c3-8d6f-57dbe34c87f7/text:0 msgid "I don't know that color. Try again." msgstr "" -#: Favorites/aac779a9-e2a6-4a11-9efa-9670e081a33a/text:0 +#: Favorites/4cadf512-1299-468f-85e4-26af9edec193/text:0 msgid "I don't know that one, try again please." msgstr "" -#: Favorites/ada3d96a-a1a2-41eb-aac7-febdb98a9b4c/text:0 +#: Favorites/52d7a9ab-52b7-4e82-ba7f-672fb8d6ec91/text:0 msgid "Mmmmm... delicious @results.beer.category_localized. If only they made @(lower(results.color)) @results.beer.category_localized! Lastly, what is your name?" msgstr "" -#: Favorites/a813de57-c92a-4128-804d-56e80b332142/name:0 +#: Favorites/87b850ff-ddc5-4add-8a4f-c395c3a9ac38/name:0 msgid "Mutzig" msgstr "" -#: Favorites/3e2dcf45-ffc0-4197-b5ab-25ed974ea612/name:0 +#: Favorites/6e367c0c-65ab-479a-82e3-c597d8e35eef/name:0 msgid "No Response" msgstr "" -#: Favorites/5563a722-9680-419c-a792-b1fa9df92e06/name:0 -#: Favorites/87b850ff-ddc5-4add-8a4f-c395c3a9ac38/name:0 -#: Pick+a+Number/0d15ae52-5ad9-4d64-9c64-e27545d48a19/name:0 +#: Favorites/c169352e-1944-4451-8d32-eb39c41cb3ae/name:0 +#: Favorites/e0ec2076-2746-43b4-a410-c3af47d6a121/name:0 +#: Pick+a+Number/34ef666f-24a0-41cc-b364-e8b08a6e89ff/name:0 msgid "Other" msgstr "" -#: Pick+a+Number/bb3276d9-543b-427b-9d00-a926dabc8e24/text:0 +#: Pick+a+Number/a39e1d4b-ceda-45e5-b889-11ddcbc77fde/text:0 msgid "Pick a number between 1-10." msgstr "" -#: Favorites/a03dceb1-7ac1-491d-93ef-23d3e099633b/name:0 +#: Favorites/b9d718d3-b5e0-4d26-998e-2da31b24f2f9/name:0 msgid "Primus" msgstr "" -#: Favorites/3ffb6f24-2ed8-4fd5-bcc0-b2e2668672a8/name:0 +#: Favorites/5563a722-9680-419c-a792-b1fa9df92e06/name:0 msgid "Red" msgstr "" -#: Favorites/2ba89eb6-6981-4c0d-a19d-3cf1fde52a43/name:0 +#: Favorites/dbc3b9d2-e6ce-4ebe-9552-8ddce482c1d1/name:0 msgid "Skol" msgstr "" -#: Favorites/cb6fc9b4-d6e9-4ed3-8a11-3f4d19654a48/text:0 +#: Favorites/e92b12c5-1817-468e-aa2f-8791fb6247e9/text:0 msgid "Sorry you can't participate right now, I'll try again later." msgstr "" -#: Favorites/a602e75e-0814-4034-bb95-770906ddfe34/text:0 +#: Favorites/491f3ed1-9154-4acb-8fdd-0a37567e0574/text:0 msgid "Thanks @results.name, we are all done!" msgstr "" -#: Favorites/58119801-ed31-4538-888d-23779a01707f/name:0 +#: Favorites/f1ca9ac8-d0aa-4758-a969-195be7330267/name:0 msgid "Turbo King" msgstr "" -#: Favorites/f4495f19-37ee-4e51-a7d5-d99ef6be147a/text:0 +#: Favorites/8c2504ef-0acc-405f-9efe-d5fc2c434a93/text:0 msgid "What is your favorite color?" msgstr "" -#: Pick+a+Number/b634f07f-7b2d-47bd-8795-051e56cf2609/text:0 +#: Pick+a+Number/f90c9734-3e58-4c07-96cc-315266c8ecfd/text:0 msgid "You picked @results.number!" msgstr ""