Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: URL linked to $request_ref->{world_current_link} & $world_subdomain #6669

Merged
merged 9 commits into from
May 12, 2022
Merged

fix: URL linked to $request_ref->{world_current_link} & $world_subdomain #6669

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
755ed36
fix:French translation Typo
pradumna-gautam Apr 19, 2022
12a59b3
Merge branch 'openfoodfacts:main' into main
pradumna-gautam Apr 22, 2022
bbd3a1b
Changed the URL linked to ->{world_current_link}
pradumna-gautam Apr 22, 2022
2665555
Changes in sub get_world_subdomain
pradumna-gautam May 10, 2022
c2453b7
Merge branch 'main' into displaypm
pradumna-gautam May 10, 2022
f4d8462
Issue Resolved
pradumna-gautam May 11, 2022
2ab5218
Issue Resolved
pradumna-gautam May 11, 2022
0ed48b5
Merge branch 'displaypm' of github.com:pradumna-gautam/openfoodfacts-…
pradumna-gautam May 11, 2022
926ca8b
Issue Resolved
pradumna-gautam May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions lib/ProductOpener/Display.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ BEGIN
&display_possible_improvement_description
&display_properties

&get_world_subdomain

&data_to_display_nutriscore_and_nutrient_levels
&data_to_display_ingredients_analysis

Expand All @@ -114,7 +116,6 @@ BEGIN
$formatted_subdomain
$images_subdomain
$static_subdomain
$world_subdomain
$producers_platform_url
$test
@lcs
Expand Down Expand Up @@ -305,9 +306,14 @@ $default_request_ref = {

use vars qw();

sub get_world_subdomain() {
my $prefix = ($lc eq "en") ? "world" : "world-$lc";
return format_subdomain($prefix);
}

$static_subdomain = format_subdomain('static');
$images_subdomain = format_subdomain('images');
$world_subdomain = format_subdomain('world');


my $user_preferences; # enables using user preferences to show a product summary and to rank and filter results

Expand Down Expand Up @@ -542,7 +548,7 @@ sub init()
}
elsif ($ENV{QUERY_STRING} !~ /(cgi|api)\//) {
# redirect
my $redirect = "$world_subdomain/" . $ENV{QUERY_STRING};
my $redirect = get_world_subdomain() . "/" . $ENV{QUERY_STRING};
$log->info("request could not be matched to a known format, redirecting", { subdomain => $subdomain, lc => $lc, cc => $cc, country => $country, redirect => $redirect }) if $log->is_info();
$r->headers_out->set(Location => $redirect);
$r->status(301);
Expand Down Expand Up @@ -2959,7 +2965,7 @@ sub display_points($) {
}
$newtagidpath = canonicalize_taxonomy_tag_link($lc,$tagtype, $newtagid);
$request_ref->{current_link} = $newtagidpath;
$request_ref->{world_current_link} = canonicalize_taxonomy_tag_link('en',$tagtype, $canon_tagid);
$request_ref->{world_current_link} = canonicalize_taxonomy_tag_link($lc,$tagtype, $canon_tagid);
}
else {
$display_tag = canonicalize_tag2($tagtype, $tagid);
Expand Down Expand Up @@ -3132,7 +3138,7 @@ sub display_tag($) {
}
$newtagidpath = canonicalize_taxonomy_tag_link($lc,$tagtype, $newtagid);
$request_ref->{current_link} = $newtagidpath;
$request_ref->{world_current_link} = canonicalize_taxonomy_tag_link('en',$tagtype, $canon_tagid);
$request_ref->{world_current_link} = canonicalize_taxonomy_tag_link($lc,$tagtype, $canon_tagid);
}
else {
$display_tag = canonicalize_tag2($tagtype, $tagid);
Expand Down Expand Up @@ -3181,7 +3187,7 @@ sub display_tag($) {
}
$newtagid2path = canonicalize_taxonomy_tag_link($lc,$tagtype2, $newtagid2);
$request_ref->{current_link} .= $newtagid2path;
$request_ref->{world_current_link} .= canonicalize_taxonomy_tag_link('en',$tagtype2, $canon_tagid2);
$request_ref->{world_current_link} .= canonicalize_taxonomy_tag_link($lc,$tagtype2, $canon_tagid2);
}
else {
$display_tag2 = canonicalize_tag2($tagtype2, $tagid2);
Expand Down Expand Up @@ -3215,7 +3221,7 @@ sub display_tag($) {
}

if (defined $request_ref->{groupby_tagtype}) {
$request_ref->{world_current_link} .= "/" . $tag_type_plural{$request_ref->{groupby_tagtype}}{en};
$request_ref->{world_current_link} .= "/" . $tag_type_plural{$request_ref->{groupby_tagtype}}{$lc};
}

if (((defined $newtagid) and ($newtagid ne $tagid)) or ((defined $newtagid2) and ($newtagid2 ne $tagid2))) {
Expand Down Expand Up @@ -4062,8 +4068,10 @@ HTML
else {
$world_link = lang('view_products_from_the_entire_world');
}

$tag_template_data_ref->{world_link} = $world_link;
$tag_template_data_ref->{world_link_url} = $world_subdomain . $request_ref->{world_current_link};
$tag_template_data_ref->{world_link_url} = get_world_subdomain() . $request_ref->{world_current_link};

}

my $query_ref = {};
Expand Down Expand Up @@ -5189,7 +5197,7 @@ sub search_and_display_products($$$$$) {

$template_data_ref->{jqm} = param("jqm");
$template_data_ref->{country} = $country;
$template_data_ref->{world_subdomain} = $world_subdomain;
$template_data_ref->{world_subdomain} = get_world_subdomain();
$template_data_ref->{current_link_query} = $request_ref->{current_link_query};
$template_data_ref->{sort_by} = $sort_by;

Expand Down Expand Up @@ -7465,7 +7473,7 @@ CSS
$request_ref->{canon_url} = product_url($product_ref);

if ($lc eq 'en') {
$request_ref->{canon_url} = $world_subdomain . product_url($product_ref);
$request_ref->{canon_url} = get_world_subdomain() . product_url($product_ref);
}

# Old UPC-12 in url? Redirect to EAN-13 url
Expand Down Expand Up @@ -11143,4 +11151,4 @@ sub display_properties($) {
display_page($request_ref);
}

1;
1;