_includes/alternates/alternates.html in word-games-theme-3.0.0 vs _includes/alternates/alternates.html in word-games-theme-3.0.1

@@ -3,154 +3,89 @@
 <link data-rh="true" rel="alternate" href="{{site.url}}" hreflang="en" />
 {%- for i in matchurls -%}
 {%- for checklang in site.pages -%}
 {%- if checklang.permalink == i -%}
 {%- assign languagetext = [i] -%}
-
-
-{% assign whitelist_urls = site.data.noindexURLs.internatlionalization_whitelist_urls %}
-{% assign noindex_languages = site.data.noindexURLs.noindex_languages %}
-{% if noindex_languages contains languagetext[0] %}
-{%- if whitelist_urls -%}
-{% for url in whitelist_urls %}
-{% assign current_url = url | remove_first: '/' | strip %}
-{% assign language_url = languagetext[0] | strip %}
-{% if current_url == language_url %}
-{%- assign exclude_url = true -%}
-{% endif %}
-{% endfor %}
-{%- if exclude_url -%}
 <link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
 {%- endif -%}
-{%- endif -%}
-{%- else -%}
-<link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
-{%- endif -%}
-
-
-{%- endif -%}
 {%- endfor -%}
-
 {%- endfor -%}
 {%- else -%}
-
 {%- if matchurls contains page.permalink -%}
 {%- assign languagetext = [i] -%}
 <link data-rh="true" rel="alternate" href="{{site.url}}" hreflang="en" />
 {%- for i in matchurls -%}
 {%- assign languagetext = [i] -%}
 {%- if i== page.permalink -%}
-
-{% assign whitelist_urls = site.data.noindexURLs.internatlionalization_whitelist_urls %}
-{% assign noindex_languages = site.data.noindexURLs.noindex_languages %}
-{% if noindex_languages contains languagetext[0] %}
-{%- if whitelist_urls -%}
-{% for url in whitelist_urls %}
-{% assign current_url = url | remove_first: '/' | strip %}
-{% assign language_url = languagetext[0] | strip %}
-{% if current_url == language_url %}
-{%- assign exclude_url = true -%}
-{% endif %}
-{% endfor %}
-{%- if exclude_url -%}
 <link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
-{%- endif -%}
-{%- endif -%}
 {%- else -%}
-<link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
-{%- endif -%}
-
-
-{%- else -%}
-
 {%- for checklang in site.pages -%}
 {%- if checklang.permalink == i -%}
 {%- assign languagetext = [i] -%}
-
-{% assign noindex_languages = site.data.noindexURLs.noindex_languages %}
-{% if noindex_languages contains languagetext[0] %}
-{%- if whitelist_urls -%}
-{% for url in whitelist_urls %}
-{% assign current_url = url | remove_first: '/' | strip %}
-{% assign language_url = languagetext[0] | strip %}
-{% if current_url == language_url %}
-{%- assign exclude_url = true -%}
-{% endif %}
-{%- if exclude_url -%}
 <link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
 {%- endif -%}
-{% endfor %}
-{%- endif -%}
-{%- else -%}
-<link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
-{%- endif -%}
-
-{%- endif -%}
 {%- endfor -%}
 {%- endif -%}
 {%- endfor -%}
+
 {%- else -%}
 
 {%- for item in site.pages -%}
 {%- assign languagetext = [item.lang] -%}
 {%- assign pagelink = page.permalink | split: "/" | last-%}
 {%- assign itemlink = item.permalink | split: "/" | last-%}
 
-{%- if pagelink == itemlink and page.lang != item.lang and page.permalink != item.permalink -%}
-{% assign noindex_languages = site.data.noindexURLs.noindex_languages %}
-{% if noindex_languages contains languagetext[0] %}
-{%- if whitelist_urls -%}
+
+{% if pagelink == itemlink and page.lang != item.lang and page.permalink != item.permalink %}
+{% assign whitelist_urls = site.data.noindexURLs.internatlionalization_whitelist_urls %}
+{% if whitelist_urls %}
+{% assign exclude_url = false %}
 {% for url in whitelist_urls %}
 {% assign current_url = url | strip %}
 {% if current_url == item.permalink %}
-{%- assign exclude_url = true -%}
+{% assign exclude_url = true %}
 {% endif %}
 {% endfor %}
-{%- if exclude_url -%}
-<link data-rh="true" rel="alternate" href="{{site.url}}{{item.permalink}}" hreflang="{{languagetext[0]}}" />
-{%- endif -%}
-{%- endif -%}
-{%- else -%}
-<link data-rh="true" rel="alternate" href="{{site.url}}{{item.permalink}}" hreflang="{{languagetext[0]}}" />
-{%- endif -%}
-{%- endif -%}
+{% if exclude_url %}
+<link data-rh="true" rel="alternate" href="{{ site.url }}{{ item.permalink }}" hreflang="{{ languagetext[0] }}" />
+{% endif %}
+{% endif %}
+{% endif %}
 
 
 {%- if pagelink == itemlink and page.lang == item.lang -%}
-
 {% assign whitelist_urls = site.data.noindexURLs.internatlionalization_whitelist_urls %}
 {% assign noindex_languages = site.data.noindexURLs.noindex_languages %}
 {% if noindex_languages contains languagetext[0] %}
 {%- if whitelist_urls -%}
+{% assign exclude_url = false %}
 {% for url in whitelist_urls %}
 {% assign current_url = url | strip %}
 {% if current_url == item.permalink %}
 {%- assign exclude_url = true -%}
 {% endif %}
 {% endfor %}
 {%- if exclude_url -%}
 <link data-rh="true" rel="alternate" href="{{site.url}}{{item.permalink}}" hreflang="{{languagetext[0]}}" />
 {%- endif -%}
 {%- endif -%}
+
 {%- else -%}
 
 
 {% assign final_permalink = item.permalink %}
 {% if item.permalink contains '/' %}
 {% else %}
-  {% assign final_permalink = '/' | append: item.permalink %}
+{% assign final_permalink = '/' | append: item.permalink %}
 {% endif %}
-
-
 {% assign blacklist_urls = site.data.noindexURLs.blacklist_urls %}
 {%- if blacklist_urls contains final_permalink -%}
 {%- else -%}
 <link data-rh="true" rel="alternate" href="{{ site.url }}{{final_permalink}}" hreflang="{{ languagetext[0] }}" />
 {%- endif -%}
 
 
 {%- endif -%}
 {%- endif -%}
-
 {%- endfor -%}
 {%- endif -%}
 {%- endif -%}
\ No newline at end of file