From 5839a9a7c610bbe9582a8c7e02204cf1e6f2d69d Mon Sep 17 00:00:00 2001 From: Julien <120013023+albatrousse@users.noreply.github.com> Date: Thu, 26 Oct 2023 17:46:51 +0200 Subject: [PATCH] feat: enable user to edit their preferred language and the country they live in (#8826) The goal is to add, when signing up and in the user profile, a field for the user to inform their preferred language and the country they live. When signing up, the fields will be prefill with the country associated with the website (looking at the country code) the user uses and the same goes for the language. The country list function is also cached and reused for country.pl ### Related issue(s) and discussion - Fixes #8748 and #8749 --- cgi/countries.pl | 38 +-- cgi/user.pl | 31 ++- lib/ProductOpener/TestDefaults.pm | 2 + lib/ProductOpener/Users.pm | 7 +- lib/ProductOpener/Web.pm | 69 ++++- po/common/common.pot | 6 +- po/common/en.po | 4 + po/common/fr.po | 4 + .../pages/user_form/user_form_page.tt.html | 13 +- tests/integration/countries.t | 31 +++ tests/integration/create_pro_user.t | 31 ++- tests/integration/create_user.t | 2 +- .../countries/list-countries-filtered-fr.json | 8 + .../countries/list-countries-french.json | 254 ++++++++++++++++++ .../countries/list-countries-world.json | 254 ++++++++++++++++++ .../user-after-subscription.json | 2 + tests/integration/modify_user.t | 4 + 17 files changed, 708 insertions(+), 52 deletions(-) create mode 100644 tests/integration/countries.t create mode 100644 tests/integration/expected_test_results/countries/list-countries-filtered-fr.json create mode 100644 tests/integration/expected_test_results/countries/list-countries-french.json create mode 100644 tests/integration/expected_test_results/countries/list-countries-world.json diff --git a/cgi/countries.pl b/cgi/countries.pl index aa5b610211953..7d08ea2ddff1a 100644 --- a/cgi/countries.pl +++ b/cgi/countries.pl @@ -27,16 +27,13 @@ use ProductOpener::Config qw/:all/; use ProductOpener::Store qw/:all/; -use ProductOpener::Index qw/:all/; use ProductOpener::Display qw/:all/; -use ProductOpener::Users qw/:all/; -use ProductOpener::URL qw/:all/; use ProductOpener::Lang qw/:all/; use ProductOpener::Tags qw/:all/; +use ProductOpener::Web qw/get_countries_options_list/; use CGI qw/:cgi :form escapeHTML/; use URI::Escape::XS; -use Storable qw/dclone/; use Encode; use JSON::PP; @@ -47,30 +44,17 @@ my $term = decode utf8 => single_param('term'); +my @options = @{get_countries_options_list($lang, undef)}; +if (defined $term and $term ne '') { + # filter by term + @options = grep {$_->{label} =~ /$term/i} @options; +} my %result = (); -foreach my $country ( - sort { - ( get_string_id_for_lang("no_language", $translations_to{countries}{$a}{$lang}) - || get_string_id_for_lang("no_language", $translations_to{countries}{$a}{'en'})) - cmp( get_string_id_for_lang("no_language", $translations_to{countries}{$b}{$lang}) - || get_string_id_for_lang("no_language", $translations_to{countries}{$b}{'en'})) - } - keys %{$properties{countries}} - ) -{ - - my $cc = country_to_cc($country); - if (not(defined $cc)) { - next; - } - - my $tag = display_taxonomy_tag($lang, 'countries', $country); - if ( (not defined $term) - or ($term eq '') - or ($tag =~ /$term/i)) - { - $result{$cc} = $tag; - } +# transform to simple dict and use codes +foreach my $option (@options) { + my $code = country_to_cc($option->{value}); + next if not defined $code; + $result{$code} = $option->{prefixed}; } my $data = encode_json(\%result); diff --git a/cgi/user.pl b/cgi/user.pl index 8f56643bfb1a9..d0b91ff417720 100644 --- a/cgi/user.pl +++ b/cgi/user.pl @@ -26,6 +26,7 @@ use ProductOpener::Store qw/:all/; use ProductOpener::Index qw/:all/; use ProductOpener::Display qw/:all/; +use ProductOpener::Web qw/:all/; use ProductOpener::Users qw/:all/; use ProductOpener::Lang qw/:all/; use ProductOpener::Orgs qw/:all/; @@ -169,6 +170,12 @@ $template_data_ref->{sections} = []; if ($user_ref) { + my $selected_language = $user_ref->{preferred_language} + // (remove_tags_and_quote(single_param('preferred_language')) || "$lc"); + my $selected_country = $user_ref->{country} // (remove_tags_and_quote(single_param('country')) || $country); + if ($selected_country eq "en:world") { + $selected_country = ""; + } push @{$template_data_ref->{sections}}, { id => "user", fields => [ @@ -193,6 +200,20 @@ type => "password", label => "password_confirm" }, + { + field => "preferred_language", + type => "select", + label => "preferred_language", + selected => $selected_language, + options => get_languages_options_list($lc), + }, + { + field => "country", + type => "select", + label => "select_country", + selected => $selected_country, + options => get_countries_options_list($lc), + }, { # this is a honeypot to detect scripts, that fills every fields # this one is hidden in a div and user won't see it @@ -203,6 +224,10 @@ ] }; + # news letter subscription value + my $newsletter = $user_ref->{newsletter} // (remove_tags_and_quote(single_param('newsletter')) || "on"); + push @{$template_data_ref->{newsletter}}, $newsletter; + # Professional account push @{$template_data_ref->{sections}}, { @@ -257,6 +282,8 @@ } # Contributor section + my $display_barcode = $user_ref->{display_barcode} || remove_tags_and_quote(single_param('display_barcode')); + my $edit_link = $user_ref->{edit_link} || remove_tags_and_quote(single_param('edit_link')); my $contributor_section_ref = { id => "contributor_settings", name => lang("contributor_settings") . " (" . lang("optional") . ")", @@ -266,13 +293,13 @@ field => "display_barcode", type => "checkbox", label => display_icon("barcode") . lang("display_barcode_in_search"), - value => $user_ref->{display_barcode} && "on", + value => $display_barcode && "on", }, { field => "edit_link", type => "checkbox", label => display_icon("edit") . lang("edit_link_in_search"), - value => $user_ref->{edit_link} && "on", + value => $edit_link && "on", }, ] }; diff --git a/lib/ProductOpener/TestDefaults.pm b/lib/ProductOpener/TestDefaults.pm index caee6817f22e2..d105a97d415fe 100644 --- a/lib/ProductOpener/TestDefaults.pm +++ b/lib/ProductOpener/TestDefaults.pm @@ -65,6 +65,8 @@ A basic user. team_1 => "", team_2 => "", team_3 => "", + preferred_language => "en", + country => "en:united-states", action => "process", type => "add" ); diff --git a/lib/ProductOpener/Users.pm b/lib/ProductOpener/Users.pm index 2071855a7c0b9..de21925aa3207 100644 --- a/lib/ProductOpener/Users.pm +++ b/lib/ProductOpener/Users.pm @@ -403,6 +403,10 @@ sub check_user_form ($type, $user_ref, $errors_ref) { $user_ref->{email} = $email; } + # Country and preferred language + $user_ref->{preferred_language} = remove_tags_and_quote(single_param("preferred_language")); + $user_ref->{country} = remove_tags_and_quote(single_param("country")); + # Is there a checkbox to make a professional account if (defined single_param("pro_checkbox")) { @@ -684,7 +688,8 @@ sub process_user_form ($type, $user_ref, $request_ref) { # Fetch the HTML mail template corresponding to the user language, english is the # default if the translation is not available - my $email_content = get_html_email_content("user_welcome.html", $user_ref->{initial_lc}); + my $language = $user_ref->{preferred_language} || $user_ref->{initial_lc}; + my $email_content = get_html_email_content("user_welcome.html", $language); my $user_name = $user_ref->{name}; # Replace placeholders by user values $email_content =~ s/\{\{USERID\}\}/$userid/g; diff --git a/lib/ProductOpener/Web.pm b/lib/ProductOpener/Web.pm index e2ad0d946af36..62ae9d150e926 100644 --- a/lib/ProductOpener/Web.pm +++ b/lib/ProductOpener/Web.pm @@ -49,6 +49,7 @@ use ProductOpener::Images qw(:all); use Template; use Log::Log4perl; +use Unicode::Collate; BEGIN { use vars qw(@ISA @EXPORT_OK %EXPORT_TAGS); @@ -58,12 +59,15 @@ BEGIN { &display_data_quality_description &display_knowledge_panel &get_languages_options_list + &get_countries_options_list ); #the fucntions which are called outside this file %EXPORT_TAGS = (all => [@EXPORT_OK]); } use vars @EXPORT_OK; +my $unicode_collate = Unicode::Collate->new(); + =head1 FUNCTIONS =head2 display_field ( $product_ref, $field ) @@ -282,6 +286,9 @@ sub display_knowledge_panel ($product_ref, $panels_ref, $panel_id) { return $html; } +# cache for languages_options_list +my %lang_options_cache = (); + =head2 get_languages_options_list( $target_lc ) Generates a data structure containing the list of languages and their translation in a target language. @@ -291,27 +298,79 @@ The data structured can be passed to HTML templates to construction a list of op sub get_languages_options_list ($target_lc) { + return $lang_options_cache{$target_lc} if (defined $lang_options_cache{$target_lc}); + my @lang_options = (); my %lang_labels = (); foreach my $l (@Langs) { - $lang_labels{$l} = display_taxonomy_tag($target_lc, 'languages', $language_codes{$l}); + my $label = display_taxonomy_tag($target_lc, 'languages', $language_codes{$l}); + # remove eventual language prefix + $label =~ s/^\w\w://; + $lang_labels{$l} = $label; } - my @lang_values = sort {$lang_labels{$a} cmp $lang_labels{$b}} @Langs; + my @lang_values = sort {$unicode_collate->cmp($lang_labels{$a}, $lang_labels{$b})} @Langs; - foreach my $l (@lang_values) { + foreach my $lang_code (@lang_values) { push( @lang_options, { - value => $l, - label => $lang_labels{$l}, + value => $lang_code, + label => $lang_labels{$lang_code}, } ); } + # cache + $lang_options_cache{$target_lc} = \@lang_options; + return \@lang_options; } +# cache for get_countries +my %countries_options_lists = (); + +=head2 get_countries_options_list( $target_lc ) + +Generates all the countries name in the $target_lc language suitable for an select option list + +=head3 Arguments + +=head4 $target_lc - language code for labels + +=head4 $exclude_world - boolean to exclude 'World' from list + +=head3 Return value + +A reference to a list of hashes with every country code and their label in the $lc language +[{value => "fr", label => "France"},…] + +=cut + +sub get_countries_options_list ($target_lc, $exclude_world = 1) { + # if already computed send it back + if (defined $countries_options_lists{$target_lc}) { + return $countries_options_lists{$target_lc}; + } + # compute countries list + my @countries_list = (); + my @tags_list = get_all_taxonomy_entries("countries"); + foreach my $tag (@tags_list) { + next if $exclude_world and ($tag eq 'en:world'); + my $country = display_taxonomy_tag($target_lc, "countries", $tag); + # remove eventual language prefix + my $country_no_code = $country; + $country_no_code =~ s/^\w\w://; + # Adding to the list the modified string + push @countries_list, {value => $tag, label => $country_no_code, prefixed => $country}; + } + # sort by name + @countries_list = sort {$unicode_collate->cmp($a->{label}, $b->{label})} @countries_list; + # cache + $countries_options_lists{$target_lc} = \@countries_list; + return \@countries_list; +} + 1; diff --git a/po/common/common.pot b/po/common/common.pot index abdad2650b016..df3e4a3963d34 100644 --- a/po/common/common.pot +++ b/po/common/common.pot @@ -6595,6 +6595,10 @@ msgctxt "relative_to_all_products" msgid "relative to all products" msgstr "relative to all products" +msgctxt "preferred_language" +msgid "Preferred Language" +msgstr "Preferred Language" + msgctxt "packagings_n_p" msgid "Numbers of packaging components" msgstr "Numbers of packaging components" @@ -6617,4 +6621,4 @@ msgstr "Weight per 100g of product" msgctxt "weight_percent" msgid "Weight percent" -msgstr "Weight percent" \ No newline at end of file +msgstr "Weight percent" diff --git a/po/common/en.po b/po/common/en.po index 2f3d469ad7bc3..86aacc9255498 100644 --- a/po/common/en.po +++ b/po/common/en.po @@ -4699,6 +4699,10 @@ msgctxt "preference_mandatory" msgid "Mandatory" msgstr "Mandatory" +msgctxt "preferred_language" +msgid "Preferred Language" +msgstr "Preferred Language" + msgctxt "packaging_alt" msgid "Recycling instructions and/or packaging information" msgstr "Recycling instructions and/or packaging information" diff --git a/po/common/fr.po b/po/common/fr.po index 4b01a2957741e..064d620436ec1 100644 --- a/po/common/fr.po +++ b/po/common/fr.po @@ -4697,6 +4697,10 @@ msgctxt "preference_mandatory" msgid "Mandatory" msgstr "Obligatoire" +msgctxt "preferred_language" +msgid "Preferred Language" +msgstr "Langue préférée" + msgctxt "packaging_alt" msgid "Recycling instructions and/or packaging information" msgstr "Instruction de recyclage et/ou informations d'emballage" diff --git a/templates/web/pages/user_form/user_form_page.tt.html b/templates/web/pages/user_form/user_form_page.tt.html index 850948932376c..345bd6b9b0631 100644 --- a/templates/web/pages/user_form/user_form_page.tt.html +++ b/templates/web/pages/user_form/user_form_page.tt.html @@ -88,6 +88,14 @@ [% ELSIF field.type == 'email' %] + [% ELSIF field.type == 'select' %] + + [% ELSIF field.type == 'checkbox' %] [% IF accepted_organization && section.id == "professional" %]

[% f_lang('f_this_is_a_pro_account_for_org', {'org' => accepted_organization}) %]

@@ -108,7 +116,6 @@ [% END %] - [% END %] @@ -146,13 +153,13 @@ [% IF type == 'add' %]

[% lang("unsubscribe_info") %]

[% END %] - [% IF userid %] + [% IF userid and (type != 'add') %]
[% lang("danger_zone") %] diff --git a/tests/integration/countries.t b/tests/integration/countries.t new file mode 100644 index 0000000000000..a25752ae32c02 --- /dev/null +++ b/tests/integration/countries.t @@ -0,0 +1,31 @@ +#!/usr/bin/perl -w + +use ProductOpener::PerlStandards; + +use Test::More; +use ProductOpener::APITest qw/:all/; + +wait_application_ready(); + +my $tests_ref = [ + { + test_case => 'list-countries-world', + path => '/cgi/countries.pl', + expected_type => "json", + }, + { + test_case => 'list-countries-french', + subdomain => 'fr', + path => '/cgi/countries.pl', + expected_type => "json", + }, + { + test_case => 'list-countries-filtered-fr', + path => '/cgi/countries.pl?term=FR', + expected_type => "json", + } +]; + +execute_api_tests(__FILE__, $tests_ref); + +done_testing(); diff --git a/tests/integration/create_pro_user.t b/tests/integration/create_pro_user.t index 96c2c83d30494..b0dbc330d21bc 100644 --- a/tests/integration/create_pro_user.t +++ b/tests/integration/create_pro_user.t @@ -31,7 +31,7 @@ ok(!html_displays_error($resp)); # create a pro moderator my $moderator_ua = new_client(); $resp = create_user($moderator_ua, \%pro_moderator_user_form); -ok(!html_displays_error($resp)); +ok(!html_displays_error($resp), "no error on future moderator creation"); # admin pass him moderator my %moderator_edit_form = ( %pro_moderator_user_form, @@ -39,7 +39,7 @@ my %moderator_edit_form = ( type => "edit", ); $resp = edit_user($admin_ua, \%moderator_edit_form); -ok(!html_displays_error($resp)); +ok(!html_displays_error($resp), "no error on admin adding moderator role"); # A user comes along, creates its profile and requests to be part of an org my $user_ua = new_client(); @@ -50,36 +50,42 @@ my %user_form = ( ); my $tail = tail_log_start(); $resp = create_user($user_ua, \%user_form); -ok(!html_displays_error($resp)); +ok(!html_displays_error($resp), "no error creating pro user"); my $logs = tail_log_read($tail); # As it is the first user of the org, user is already part of the org my $user_ref = retrieve("$data_root/users/tests.sto"); # user is already part of org -is($user_ref->{pro}, 1); +is($user_ref->{pro}, 1, "user is marked as pro"); -is($user_ref->{org}, "acme-inc"); -is($user_ref->{org_id}, "acme-inc"); +is($user_ref->{org}, "acme-inc", "org is correct"); +is($user_ref->{org_id}, "acme-inc", "org_id is correct"); # remove password for comparison and timestamps my $user_cmp_ref = dclone($user_ref); normalize_user_for_test_comparison($user_cmp_ref); -compare_to_expected_results($user_cmp_ref, "$expected_result_dir/user-after-subscription.json", - $update_expected_results); +compare_to_expected_results( + $user_cmp_ref, "$expected_result_dir/user-after-subscription.json", + $update_expected_results, {desc => "user after subscription is as expected"} +); # Org was created my $org_ref = retrieve("$data_root/orgs/acme-inc.sto"); my $org_cmp_ref = dclone($org_ref); normalize_org_for_test_comparison($org_cmp_ref); -compare_to_expected_results($org_cmp_ref, "$expected_result_dir/org-after-subscription.json", $update_expected_results); +compare_to_expected_results( + $org_cmp_ref, "$expected_result_dir/org-after-subscription.json", + $update_expected_results, {desc => "org after subscription is as expected"} +); # Get mails from log my @mails = mails_from_log($logs); # get text @mails = map {; normalize_mail_for_comparison($_)} @mails; # we got three -is(scalar @mails, 3); +is(scalar @mails, 3, "3 mails sent on subscription"); # compare -compare_to_expected_results(\@mails, "$expected_result_dir/mails.json", $update_expected_results); +compare_to_expected_results(\@mails, "$expected_result_dir/mails.json", + $update_expected_results, {desc => "mail sent after subscription"}); # the pro moderator got to the org page $resp = get_page($moderator_ua, "/cgi/org.pl?type=edit&orgid=org-acme-inc"); @@ -90,6 +96,7 @@ $resp = post_form($moderator_ua, "/cgi/org.pl", \%fields); $org_ref = retrieve("$data_root/orgs/acme-inc.sto"); $org_cmp_ref = dclone($org_ref); normalize_org_for_test_comparison($org_cmp_ref); -compare_to_expected_results($org_cmp_ref, "$expected_result_dir/org-after-validation.json", $update_expected_results); +compare_to_expected_results($org_cmp_ref, "$expected_result_dir/org-after-validation.json", + $update_expected_results, {desc => "org validated"}); done_testing(); diff --git a/tests/integration/create_user.t b/tests/integration/create_user.t index de517fa1db3c6..b1c5c394fb07b 100644 --- a/tests/integration/create_user.t +++ b/tests/integration/create_user.t @@ -25,7 +25,7 @@ my $url = construct_test_url("/cgi/user.pl?type=edit&userid=tests", "world"); my $response = $ua->get($url); #$DB::single = 1; -is $response->{_rc}, 200; +is($response->{_rc}, 200, "Status ok on creation"); #checking whether the preference were well saved my @words = ('bob@test.com', $default_user_form{userid}, $default_user_form{name}); diff --git a/tests/integration/expected_test_results/countries/list-countries-filtered-fr.json b/tests/integration/expected_test_results/countries/list-countries-filtered-fr.json new file mode 100644 index 0000000000000..fe2862de57fa4 --- /dev/null +++ b/tests/integration/expected_test_results/countries/list-countries-filtered-fr.json @@ -0,0 +1,8 @@ +{ + "cf" : "Central African Republic", + "fr" : "France", + "gf" : "French Guiana", + "pf" : "French Polynesia", + "tf" : "French Southern and Antarctic Lands", + "za" : "South Africa" +} diff --git a/tests/integration/expected_test_results/countries/list-countries-french.json b/tests/integration/expected_test_results/countries/list-countries-french.json new file mode 100644 index 0000000000000..92f71fdcdc785 --- /dev/null +++ b/tests/integration/expected_test_results/countries/list-countries-french.json @@ -0,0 +1,254 @@ +{ + "ad" : "Andorre", + "ae" : "Émirats arabes unis", + "af" : "Afghanistan", + "ag" : "Antigua-et-Barbuda", + "ai" : "Anguilla", + "al" : "Albanie", + "am" : "Arménie", + "ao" : "Angola", + "aq" : "Région antarctique", + "ar" : "Argentine", + "as" : "Samoa américaines", + "at" : "Autriche", + "au" : "Australie", + "aw" : "Aruba", + "ax" : "Åland", + "az" : "Azerbaïdjan", + "ba" : "Bosnie-Herzégovine", + "bb" : "Barbade", + "bd" : "Bangladesh", + "be" : "Belgique", + "bf" : "Burkina Faso", + "bg" : "Bulgarie", + "bh" : "Bahreïn", + "bi" : "Burundi", + "bj" : "Bénin", + "bl" : "Saint-Barthélemy", + "bm" : "Bermudes", + "bn" : "Brunei", + "bo" : "Bolivie", + "bq" : "Pays-Bas caribéens", + "br" : "Brésil", + "bs" : "Bahamas", + "bt" : "Bhoutan", + "bv" : "Île Bouvet", + "bw" : "Botswana", + "by" : "Biélorussie", + "bz" : "Belize", + "ca" : "Canada", + "cc" : "Îles Cocos", + "cd" : "République démocratique du Congo", + "cf" : "République centrafricaine", + "cg" : "République du Congo", + "ch" : "Suisse", + "ci" : "Côte d'Ivoire", + "ck" : "Îles Cook", + "cl" : "Chili", + "cm" : "Cameroun", + "cn" : "Chine", + "co" : "Colombie", + "cr" : "Costa Rica", + "cu" : "Cuba", + "cv" : "Cap-Vert", + "cw" : "Curaçao", + "cx" : "Île Christmas", + "cy" : "Chypre", + "cz" : "République tchèque", + "de" : "Allemagne", + "dj" : "Djibouti", + "dk" : "Danemark", + "dm" : "Dominique", + "do" : "République dominicaine", + "dz" : "Algérie", + "ec" : "Équateur", + "ee" : "Estonie", + "eg" : "Égypte", + "eh" : "Sahara occidental", + "er" : "Érythrée", + "es" : "Espagne", + "et" : "Éthiopie", + "fi" : "Finlande", + "fj" : "Fidji", + "fk" : "Îles Malouines", + "fm" : "Micronésie", + "fo" : "Îles Féroé", + "fr" : "France", + "ga" : "Gabon", + "gd" : "Grenade", + "ge" : "Géorgie", + "gf" : "Guyane", + "gg" : "Guernesey", + "gh" : "Ghana", + "gi" : "Gibraltar", + "gl" : "Groenland", + "gm" : "Gambie", + "gn" : "Guinée", + "gp" : "Guadeloupe", + "gq" : "Guinée équatoriale", + "gr" : "Grèce", + "gs" : "Géorgie du Sud-et-les Îles Sandwich du Sud", + "gt" : "Guatemala", + "gu" : "Guam", + "gw" : "Guinée-Bissau", + "gy" : "Guyana", + "hk" : "Hong Kong", + "hm" : "Îles Heard-et-MacDonald", + "hn" : "Honduras", + "hr" : "Croatie", + "ht" : "Haïti", + "hu" : "Hongrie", + "id" : "Indonésie", + "ie" : "Irlande", + "il" : "Israël", + "im" : "Île de Man", + "in" : "Inde", + "io" : "Territoire britannique de l'océan Indien", + "iq" : "Irak", + "ir" : "Iran", + "is" : "Islande", + "it" : "Italie", + "je" : "Jersey", + "jm" : "Jamaïque", + "jo" : "Jordanie", + "jp" : "Japon", + "ke" : "Kenya", + "kg" : "Kirghizistan", + "kh" : "Cambodge", + "ki" : "Kiribati", + "km" : "Comores", + "kn" : "Saint-Christophe-et-Niévès", + "kp" : "Corée du Nord", + "kr" : "Corée du Sud", + "kw" : "Koweït", + "ky" : "Îles Caïmans", + "kz" : "Kazakhstan", + "la" : "Laos", + "lb" : "Liban", + "lc" : "Sainte-Lucie", + "li" : "Liechtenstein", + "lk" : "Sri Lanka", + "lr" : "Liberia", + "ls" : "Lesotho", + "lt" : "Lituanie", + "lu" : "Luxembourg", + "lv" : "Lettonie", + "ly" : "Libye", + "ma" : "Maroc", + "mc" : "Monaco", + "md" : "Moldavie", + "me" : "Monténégro", + "mf" : "Saint-Martin", + "mg" : "Madagascar", + "mh" : "Îles Marshall", + "mk" : "Macédoine du Nord", + "ml" : "Mali", + "mm" : "Birmanie", + "mn" : "Mongolie", + "mo" : "Macao", + "mp" : "Îles Mariannes du Nord", + "mq" : "Martinique", + "mr" : "Mauritanie", + "ms" : "Montserrat", + "mt" : "Malte", + "mu" : "Maurice", + "mv" : "Maldives", + "mw" : "Malawi", + "mx" : "Mexique", + "my" : "Malaisie", + "mz" : "Mozambique", + "na" : "Namibie", + "nc" : "Nouvelle-Calédonie", + "ne" : "Niger", + "nf" : "Île Norfolk", + "ng" : "Nigeria", + "ni" : "Nicaragua", + "nl" : "Pays-Bas", + "no" : "Norvège", + "np" : "Népal", + "nr" : "Nauru", + "nu" : "Niue", + "nz" : "Nouvelle-Zélande", + "om" : "Oman", + "pa" : "Panama", + "pe" : "Pérou", + "pf" : "Polynésie française", + "pg" : "Papouasie-Nouvelle-Guinée", + "ph" : "Philippines", + "pk" : "Pakistan", + "pl" : "Pologne", + "pm" : "Saint-Pierre-et-Miquelon", + "pn" : "Îles Pitcairn", + "pr" : "Porto Rico", + "ps" : "État de Palestine", + "pt" : "Portugal", + "pw" : "Palaos", + "py" : "Paraguay", + "qa" : "Qatar", + "re" : "La Réunion", + "ro" : "Roumanie", + "rs" : "Serbie", + "ru" : "Russie", + "rw" : "Rwanda", + "sa" : "Arabie saoudite", + "sb" : "Salomon", + "sc" : "Seychelles", + "sd" : "Soudan", + "se" : "Suède", + "sg" : "Singapour", + "sh" : "Sainte-Hélène", + "si" : "Slovénie", + "sj" : "Svalbard et Jan Mayen", + "sk" : "Slovaquie", + "sl" : "Sierra Leone", + "sm" : "Saint-Marin", + "sn" : "Sénégal", + "so" : "Somalie", + "sr" : "Suriname", + "ss" : "Soudan du Sud", + "st" : "Sao Tomé-et-Principe", + "sv" : "Salvador", + "sx" : "Sint-Maarten", + "sy" : "Syrie", + "sz" : "Swaziland", + "tc" : "Îles Turques-et-Caïques", + "td" : "Tchad", + "tf" : "Terres australes et antarctiques françaises", + "tg" : "Togo", + "th" : "Thaïlande", + "tj" : "Tadjikistan", + "tk" : "Tokelau", + "tl" : "Timor oriental", + "tm" : "Turkménistan", + "tn" : "Tunisie", + "to" : "Tonga", + "tr" : "Turquie", + "tt" : "Trinité-et-Tobago", + "tv" : "Tuvalu", + "tw" : "Taiwan", + "tz" : "Tanzanie", + "ua" : "Ukraine", + "ug" : "Ouganda", + "uk" : "Royaume-Uni", + "um" : "Îles mineures éloignées des États-Unis", + "us" : "États-Unis", + "uy" : "Uruguay", + "uz" : "Ouzbékistan", + "va" : "Vatican", + "vc" : "Saint-Vincent-et-les-Grenadines", + "ve" : "Venezuela", + "vg" : "Îles Vierges britanniques", + "vi" : "Îles Vierges des États-Unis", + "vn" : "Viêt Nam", + "vu" : "Vanuatu", + "wf" : "Wallis-et-Futuna", + "world" : "Monde", + "ws" : "Samoa", + "xk" : "en:Kosovo", + "ye" : "Yémen", + "yt" : "Mayotte", + "yu" : "Yougoslavie", + "za" : "Afrique du Sud", + "zm" : "Zambie", + "zw" : "Zimbabwe" +} diff --git a/tests/integration/expected_test_results/countries/list-countries-world.json b/tests/integration/expected_test_results/countries/list-countries-world.json new file mode 100644 index 0000000000000..1d69d4072a3fb --- /dev/null +++ b/tests/integration/expected_test_results/countries/list-countries-world.json @@ -0,0 +1,254 @@ +{ + "ad" : "Andorra", + "ae" : "United Arab Emirates", + "af" : "Afghanistan", + "ag" : "Antigua and Barbuda", + "ai" : "Anguilla", + "al" : "Albania", + "am" : "Armenia", + "ao" : "Angola", + "aq" : "Antarctic", + "ar" : "Argentina", + "as" : "American Samoa", + "at" : "Austria", + "au" : "Australia", + "aw" : "Aruba", + "ax" : "Åland Islands", + "az" : "Azerbaijan", + "ba" : "Bosnia and Herzegovina", + "bb" : "Barbados", + "bd" : "Bangladesh", + "be" : "Belgium", + "bf" : "Burkina Faso", + "bg" : "Bulgaria", + "bh" : "Bahrain", + "bi" : "Burundi", + "bj" : "Benin", + "bl" : "Saint-Barthélemy", + "bm" : "Bermuda", + "bn" : "Brunei", + "bo" : "Bolivia", + "bq" : "Caribbean Netherlands", + "br" : "Brazil", + "bs" : "The Bahamas", + "bt" : "Bhutan", + "bv" : "Bouvet Island", + "bw" : "Botswana", + "by" : "Belarus", + "bz" : "Belize", + "ca" : "Canada", + "cc" : "Cocos (Keeling) Islands", + "cd" : "Democratic Republic of the Congo", + "cf" : "Central African Republic", + "cg" : "Republic of the Congo", + "ch" : "Switzerland", + "ci" : "Côte d'Ivoire", + "ck" : "Cook Islands", + "cl" : "Chile", + "cm" : "Cameroon", + "cn" : "China", + "co" : "Colombia", + "cr" : "Costa Rica", + "cu" : "Cuba", + "cv" : "Cape Verde", + "cw" : "Curaçao", + "cx" : "Christmas Island", + "cy" : "Cyprus", + "cz" : "Czech Republic", + "de" : "Germany", + "dj" : "Djibouti", + "dk" : "Denmark", + "dm" : "Dominica", + "do" : "Dominican Republic", + "dz" : "Algeria", + "ec" : "Ecuador", + "ee" : "Estonia", + "eg" : "Egypt", + "eh" : "Western Sahara", + "er" : "Eritrea", + "es" : "Spain", + "et" : "Ethiopia", + "fi" : "Finland", + "fj" : "Fiji", + "fk" : "Falkland Islands", + "fm" : "Federated States of Micronesia", + "fo" : "Faroe Islands", + "fr" : "France", + "ga" : "Gabon", + "gd" : "Grenada", + "ge" : "Georgia", + "gf" : "French Guiana", + "gg" : "Guernsey", + "gh" : "Ghana", + "gi" : "Gibraltar", + "gl" : "Greenland", + "gm" : "Gambia", + "gn" : "Guinea", + "gp" : "Guadeloupe", + "gq" : "Equatorial Guinea", + "gr" : "Greece", + "gs" : "South Georgia and the South Sandwich Islands", + "gt" : "Guatemala", + "gu" : "Guam", + "gw" : "Guinea-Bissau", + "gy" : "Guyana", + "hk" : "Hong Kong", + "hm" : "Heard Island and McDonald Islands", + "hn" : "Honduras", + "hr" : "Croatia", + "ht" : "Haiti", + "hu" : "Hungary", + "id" : "Indonesia", + "ie" : "Ireland", + "il" : "Israel", + "im" : "Isle of Man", + "in" : "India", + "io" : "British Indian Ocean Territory", + "iq" : "Iraq", + "ir" : "Iran", + "is" : "Iceland", + "it" : "Italy", + "je" : "Jersey", + "jm" : "Jamaica", + "jo" : "Jordan", + "jp" : "Japan", + "ke" : "Kenya", + "kg" : "Kyrgyzstan", + "kh" : "Cambodia", + "ki" : "Kiribati", + "km" : "Comoros", + "kn" : "Saint Kitts and Nevis", + "kp" : "North Korea", + "kr" : "South Korea", + "kw" : "Kuwait", + "ky" : "Cayman Islands", + "kz" : "Kazakhstan", + "la" : "Laos", + "lb" : "Lebanon", + "lc" : "Saint Lucia", + "li" : "Liechtenstein", + "lk" : "Sri Lanka", + "lr" : "Liberia", + "ls" : "Lesotho", + "lt" : "Lithuania", + "lu" : "Luxembourg", + "lv" : "Latvia", + "ly" : "Libya", + "ma" : "Morocco", + "mc" : "Monaco", + "md" : "Moldova", + "me" : "Montenegro", + "mf" : "Saint Martin", + "mg" : "Madagascar", + "mh" : "Marshall Islands", + "mk" : "North Macedonia", + "ml" : "Mali", + "mm" : "Myanmar", + "mn" : "Mongolia", + "mo" : "Macau", + "mp" : "Northern Mariana Islands", + "mq" : "Martinique", + "mr" : "Mauritania", + "ms" : "Montserrat", + "mt" : "Malta", + "mu" : "Mauritius", + "mv" : "Maldives", + "mw" : "Malawi", + "mx" : "Mexico", + "my" : "Malaysia", + "mz" : "Mozambique", + "na" : "Namibia", + "nc" : "New Caledonia", + "ne" : "Niger", + "nf" : "Norfolk Island", + "ng" : "Nigeria", + "ni" : "Nicaragua", + "nl" : "Netherlands", + "no" : "Norway", + "np" : "Nepal", + "nr" : "Nauru", + "nu" : "Niue", + "nz" : "New Zealand", + "om" : "Oman", + "pa" : "Panama", + "pe" : "Peru", + "pf" : "French Polynesia", + "pg" : "Papua New Guinea", + "ph" : "Philippines", + "pk" : "Pakistan", + "pl" : "Poland", + "pm" : "Saint Pierre and Miquelon", + "pn" : "Pitcairn", + "pr" : "Puerto Rico", + "ps" : "State of Palestine", + "pt" : "Portugal", + "pw" : "Palau", + "py" : "Paraguay", + "qa" : "Qatar", + "re" : "Réunion", + "ro" : "Romania", + "rs" : "Serbia", + "ru" : "Russia", + "rw" : "Rwanda", + "sa" : "Saudi Arabia", + "sb" : "Solomon Islands", + "sc" : "Seychelles", + "sd" : "Sudan", + "se" : "Sweden", + "sg" : "Singapore", + "sh" : "Saint Helena", + "si" : "Slovenia", + "sj" : "Svalbard and Jan Mayen", + "sk" : "Slovakia", + "sl" : "Sierra Leone", + "sm" : "San Marino", + "sn" : "Senegal", + "so" : "Somalia", + "sr" : "Suriname", + "ss" : "South Sudan", + "st" : "Sao Tomé and Príncipe", + "sv" : "El Salvador", + "sx" : "Sint Maarten", + "sy" : "Syria", + "sz" : "Swaziland", + "tc" : "Turks and Caicos Islands", + "td" : "Chad", + "tf" : "French Southern and Antarctic Lands", + "tg" : "Togo", + "th" : "Thailand", + "tj" : "Tajikistan", + "tk" : "Tokelau", + "tl" : "Timor-Leste", + "tm" : "Turkmenistan", + "tn" : "Tunisia", + "to" : "Tonga", + "tr" : "Turkey", + "tt" : "Trinidad and Tobago", + "tv" : "Tuvalu", + "tw" : "Taiwan", + "tz" : "Tanzania", + "ua" : "Ukraine", + "ug" : "Uganda", + "uk" : "United Kingdom", + "um" : "United States Minor Outlying Islands", + "us" : "United States", + "uy" : "Uruguay", + "uz" : "Uzbekistan", + "va" : "Vatican City", + "vc" : "Saint Vincent and the Grenadines", + "ve" : "Venezuela", + "vg" : "British Virgin Islands", + "vi" : "Virgin Islands of the United States", + "vn" : "Vietnam", + "vu" : "Vanuatu", + "wf" : "Wallis and Futuna", + "world" : "World", + "ws" : "Samoa", + "xk" : "Kosovo", + "ye" : "Yemen", + "yt" : "Mayotte", + "yu" : "Yugoslavia", + "za" : "South Africa", + "zm" : "Zambia", + "zw" : "Zimbabwe" +} diff --git a/tests/integration/expected_test_results/create_pro_user/user-after-subscription.json b/tests/integration/expected_test_results/create_pro_user/user-after-subscription.json index 07bdd28a2c288..92eb0e42522e7 100644 --- a/tests/integration/expected_test_results/create_pro_user/user-after-subscription.json +++ b/tests/integration/expected_test_results/create_pro_user/user-after-subscription.json @@ -1,4 +1,5 @@ { + "country" : "en:united-states", "discussion" : "", "display_barcode" : "", "edit_link" : "", @@ -13,6 +14,7 @@ "old_email" : null, "org" : "acme-inc", "org_id" : "acme-inc", + "preferred_language" : "en", "pro" : 1, "registered_t" : "--ignore--", "team_1" : "", diff --git a/tests/integration/modify_user.t b/tests/integration/modify_user.t index d189f863f0b8a..b6ee7d8b2927b 100644 --- a/tests/integration/modify_user.t +++ b/tests/integration/modify_user.t @@ -20,6 +20,8 @@ my %edit_form = ( name => 'NotTest', userid => 'tests', pro_checkbox => 1, + preferred_language => "fr", + country => "en:france", action => "process", type => "edit" @@ -32,5 +34,7 @@ my $url_check = construct_test_url("/cgi/user.pl?type=edit&userid=tests", "world my $response_check = $ua->get($url_check); like($response_check->content, qr/notbob\@test\.com/, "the new email has been well saved"); like($response_check->content, qr/NotTest/, "the new name has been well saved"); +like($response_check->content, qr/value=.fr.\s+selected/, "new language saved"); +like($response_check->content, qr/value=.en:france.\s+selected/, "new country saved"); done_testing();