Commit e42aca79 authored by Úrsula Iguarán's avatar Úrsula Iguarán 💬 Committed by Rafael Alvarez

Fix issue #646

parent 08bf63c3
...@@ -28,6 +28,7 @@ checks: ...@@ -28,6 +28,7 @@ checks:
- pybabel compile --directory theme/2014/translations/ --domain messages - pybabel compile --directory theme/2014/translations/ --domain messages
- for FILE in $(find . -iname '*.adoc'); do sed -i 's/^include::/include::\/builds\/fluidsignal/g' $FILE; done - for FILE in $(find . -iname '*.adoc'); do sed -i 's/^include::/include::\/builds\/fluidsignal/g' $FILE; done
- pelican --fatal errors --fatal warnings content/ - pelican --fatal errors --fatal warnings content/
- rm -rf output/web/de
- ./html-lint.sh - ./html-lint.sh
- rm -rf output/ - rm -rf output/
artifacts: artifacts:
...@@ -72,6 +73,8 @@ deploy: ...@@ -72,6 +73,8 @@ deploy:
- for FILE in $(find . -iname '*.adoc'); do sed -i 's/^include::/include::\/builds\/fluidsignal/g' $FILE; done - for FILE in $(find . -iname '*.adoc'); do sed -i 's/^include::/include::\/builds\/fluidsignal/g' $FILE; done
# Generate the website, exiting on any error encountered # Generate the website, exiting on any error encountered
- pelican --fatal errors --fatal warnings content/ - pelican --fatal errors --fatal warnings content/
# Remove dummy folder used to translate messages to english as well
- rm -rf output/web/de
# Give the folders, named after the language of its content, a general name in each subsite # Give the folders, named after the language of its content, a general name in each subsite
- mv output/web/en/blog-en/* output/web/en/blog && mv output/web/es/blog-es/* output/web/es/blog - mv output/web/en/blog-en/* output/web/en/blog && mv output/web/es/blog-es/* output/web/es/blog
# Script to generate a complete sitemap of the site # Script to generate a complete sitemap of the site
......
...@@ -20,6 +20,7 @@ if [ ! $# -eq 0 ]; then ...@@ -20,6 +20,7 @@ if [ ! $# -eq 0 ]; then
else else
pelican --fatal errors --fatal warnings content/ pelican --fatal errors --fatal warnings content/
fi fi
rm -rf output/web/de
mv output/web/en/blog-en/* output/web/en/blog && mv output/web/es/blog-es/* output/web/es/blog mv output/web/en/blog-en/* output/web/en/blog && mv output/web/es/blog-es/* output/web/es/blog
echo "Updating sitemap, setting redirect and pages images (4/5) . . ." echo "Updating sitemap, setting redirect and pages images (4/5) . . ."
......
...@@ -7,9 +7,6 @@ sys.setdefaultencoding("utf-8") ...@@ -7,9 +7,6 @@ sys.setdefaultencoding("utf-8")
# Site information # Site information
AUTHOR = 'FLUIDAttacks' AUTHOR = 'FLUIDAttacks'
SITENAME = 'A Pentesting Company | FLUIDAttacks'
SITEURL = 'https://fluidattacks.com/web/en'
SUBSITEURL = 'https://fluidattacks.com/web/es'
# Theme # Theme
THEME = 'theme/2014' THEME = 'theme/2014'
...@@ -17,32 +14,19 @@ THEME = 'theme/2014' ...@@ -17,32 +14,19 @@ THEME = 'theme/2014'
# Date and time configuration # Date and time configuration
TIMEZONE = 'America/Bogota' TIMEZONE = 'America/Bogota'
DEFAULT_DATE_FORMAT = ('%Y-%m-%d') DEFAULT_DATE_FORMAT = ('%Y-%m-%d')
DEFAULT_LANG = 'en' DEFAULT_LANG = 'de'
OUTPUT_PATH = 'output/web/en' OUTPUT_PATH = 'output/web/de'
# URLs format # URLs format
PATH = 'content' PATH = 'content'
ARTICLE_PATHS = ['blog-en'] ARTICLE_PATHS = ['blog']
PAGE_PATHS = ['pages-en'] PAGE_PATHS = ['pages']
STATIC_PATHS = ['images', 'files', 'blog-en', 'pages-en']
ARTICLE_URL = 'blog/{slug}' ARTICLE_URL = 'blog/{slug}'
ARTICLE_SAVE_AS = 'blog-en/{slug}index.html' ARTICLE_SAVE_AS = 'blog/{slug}index.html'
PAGE_URL = '{slug}' PAGE_URL = '{slug}'
PAGE_SAVE_AS = 'pages-en/{slug}index.html' PAGE_SAVE_AS = 'pages/{slug}index.html'
DRAFT_URL = 'drafts/{slug}' DRAFT_URL = 'drafts/{slug}'
DRAFT_SAVE_AS = 'drafts/{slug}index.html' DRAFT_SAVE_AS = 'drafts/{slug}index.html'
TAGS_SAVE_AS = 'blog/tags/index.html'
TAGS_URL = 'blog/tags/'
TAG_SAVE_AS = 'blog/tags/{slug}/index.html'
TAG_URL = 'blog/tags/{slug}/'
AUTHORS_SAVE_AS = 'blog/authors/index.html'
AUTHORS_URL = 'blog/authors/'
AUTHOR_SAVE_AS = 'blog/authors/{slug}/index.html'
AUTHOR_URL = 'blog/authors/{slug}/'
CATEGORIES_SAVE_AS = 'blog/categories/index.html'
CATEGORIES_URL = 'blog/categories/'
CATEGORY_SAVE_AS = 'blog/categories/{slug}/index.html'
CATEGORY_URL = 'blog/categories/{slug}/'
USE_FOLDER_AS_CATEGORY = False USE_FOLDER_AS_CATEGORY = False
INDEX_SAVE_AS = 'blog/index.html' INDEX_SAVE_AS = 'blog/index.html'
LANDING_SAVE_AS = 'index.html' LANDING_SAVE_AS = 'index.html'
...@@ -82,6 +66,30 @@ DEFAULT_PAGINATION = 12 ...@@ -82,6 +66,30 @@ DEFAULT_PAGINATION = 12
# Line that allows the localization of the site (traslation) # Line that allows the localization of the site (traslation)
JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']} JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']}
I18N_SUBSITES = { I18N_SUBSITES = {
'en': {
'SITENAME': 'A Pentesting Company | FLUIDAttacks',
'SITEURL': 'https://fluidattacks.com/web/en',
'SUBSITEURL': 'https://fluidattacks.com/web/es',
'OUTPUT_PATH': 'output/web/en',
'THEME': 'theme/2014',
'ARTICLE_PATHS': ['blog-en'],
'PAGE_PATHS': ['pages-en'],
'PAGE_SAVE_AS': 'pages-en/{slug}index.html',
'ARTICLE_SAVE_AS': 'blog-en/{slug}index.html',
'STATIC_PATHS': ['files', 'images', 'blog-en', 'pages-en'],
'TAGS_SAVE_AS': 'blog/tags/index.html',
'TAGS_URL': 'blog/tags/',
'TAG_SAVE_AS': 'blog/tags/{slug}/index.html',
'TAG_URL': 'blog/tags/{slug}/',
'AUTHORS_SAVE_AS': 'blog/authors/index.html',
'AUTHORS_URL': 'blog/authors/',
'AUTHOR_SAVE_AS': 'blog/authors/{slug}/index.html',
'AUTHOR_URL': 'blog/authors/{slug}/',
'CATEGORIES_SAVE_AS': 'blog/categories/index.html',
'CATEGORIES_URL': 'blog/categories/',
'CATEGORY_SAVE_AS': 'blog/categories/{slug}/index.html',
'CATEGORY_URL': 'blog/categories/{slug}/',
},
'es': { 'es': {
'SITENAME': 'Especialistas en Ethical Hacking | FLUIDAttacks', 'SITENAME': 'Especialistas en Ethical Hacking | FLUIDAttacks',
'SITEURL': 'https://fluidattacks.com/web/es', 'SITEURL': 'https://fluidattacks.com/web/es',
...@@ -93,7 +101,6 @@ I18N_SUBSITES = { ...@@ -93,7 +101,6 @@ I18N_SUBSITES = {
'PAGE_SAVE_AS': 'pages-es/{slug}index.html', 'PAGE_SAVE_AS': 'pages-es/{slug}index.html',
'ARTICLE_SAVE_AS': 'blog-es/{slug}index.html', 'ARTICLE_SAVE_AS': 'blog-es/{slug}index.html',
'STATIC_PATHS': ['files', 'images', 'blog-es', 'defends', 'pages-es'], 'STATIC_PATHS': ['files', 'images', 'blog-es', 'defends', 'pages-es'],
'GOOGLE_ANALYTICS': 'UA-22974464-4',
'TAGS_SAVE_AS': 'blog/etiquetas/index.html', 'TAGS_SAVE_AS': 'blog/etiquetas/index.html',
'TAGS_URL': 'blog/etiquetas/', 'TAGS_URL': 'blog/etiquetas/',
'TAG_SAVE_AS': 'blog/etiquetas/{slug}/index.html', 'TAG_SAVE_AS': 'blog/etiquetas/{slug}/index.html',
...@@ -109,7 +116,7 @@ I18N_SUBSITES = { ...@@ -109,7 +116,7 @@ I18N_SUBSITES = {
'ASCIIDOC_OPTIONS': ['-f /etc/asciidoc/lang-es.conf'], 'ASCIIDOC_OPTIONS': ['-f /etc/asciidoc/lang-es.conf'],
} }
} }
lang_siteurls = { SUBSITE_LANG = {
'en': 'https://fluidattacks.com/web/en', 'en': 'https://fluidattacks.com/web/en',
'es': 'https://fluidattacks.com/web/es', 'es': 'https://fluidattacks.com/web/es',
} }
......
[jinja2: templates/**.html] [jinja2: templates/**.html]
extensions=webassets.ext.jinja2.AssetsExtension
\ No newline at end of file
{% extends "base.html" %} {% extends "base.html" %}
{% block meta %} {% block meta %}
<meta name="keywords" content="{{ gettext('Here you can find the latest articles posted to the blog, which are related to the field of Information Security. These articles may aim to share an opinion about a security matter, to solve a challenge related to this very subject or may just offer general information') }}."> <meta name="description" content="{{ gettext('Archives-metadescription') }}.">
<meta name="description" content="{{ gettext('Information, Security, Archives, Latest, Articles, Blog') }}"> <meta name="keywords" content="{{ gettext('Archives-keywords') }}">
{% endblock meta %} {% endblock meta %}
{% block title %} {% block title %}
{% if DEFAULT_LANG == "en" %} {% if DEFAULT_LANG == "en" %}
{{ gettext('Blog Archives') }} | {{ SITENAME }} {{ gettext('Archives-title') }} | {{ SITENAME }}
{% else %} {% else %}
{{ gettext('Blog Archives') }} | {{ AUTHOR }} {{ gettext('Archives-title') }} | {{ AUTHOR }}
{% endif %} {% endif %}
{% endblock %} {% endblock %}
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
{% if DEFAULT_LANG == "en" %} {% if DEFAULT_LANG == "en" %}
<link rel="alternate" href="{{ SITEURL }}/archives.html" hreflang="en-us" /> <link rel="alternate" href="{{ SITEURL }}/archives.html" hreflang="en-us" />
<link rel="alternate" href="{{ SUBSITEURL }}/archives.html" hreflang="es" /> <link rel="alternate" href="{{ SUBSITEURL }}/archives.html" hreflang="es" />
{% else %} {% elif DEFAULT_LANG == "es" %}
<link rel="alternate" href="{{ SITEURL }}/archives.html" hreflang="es" /> <link rel="alternate" href="{{ SITEURL }}/archives.html" hreflang="es" />
<link rel="alternate" href="{{ SUBSITEURL }}/archives.html" hreflang="en-us" /> <link rel="alternate" href="{{ SUBSITEURL }}/archives.html" hreflang="en-us" />
{% endif %} {% endif %}
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}"> <header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header"> <!--style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png');" >--> <header class="intro-header"> <!--style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png');" >-->
<a href="{{ SITEURL }}/"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png" alt="{{ gettext('Young hacker smiling') }}"></a> <a href="{{ SITEURL }}/"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png" alt="{{ gettext('Header-img-alt') }}"></a>
{% endif %} {% endif %}
</header> </header>
{% endblock header %} {% endblock header %}
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<div class="row"> <div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="post-heading"> <div class="post-heading">
<h1>{{ gettext('Archives for') }} {{ SITENAME }}</h1> <h1>{{ gettext('Arcives-msg-1') }} {{ SITENAME }}</h1>
</div> </div>
</div> </div>
</div> </div>
......
{% extends "index.html" %} {% extends "index.html" %}
{% block meta %} {% block meta %}
<meta name="keywords" content="{{ article.keywords }}">
<meta name="description" content="{{ article.description }}"> <meta name="description" content="{{ article.description }}">
<meta name="keywords" content="{{ article.keywords }}">
{% endblock meta %} {% endblock meta %}
{% block title %} {% block title %}
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
{{ article.title }} | {{ SITENAME }} {{ article.title }} | {{ SITENAME }}
{% set TITLE = 1 %} {% set TITLE = 1 %}
{% endif %} {% endif %}
{% else %} {% elif DEFAULT_LANG == "es" %}
{% if article.title|length < 11 %} {% if article.title|length < 11 %}
{{ article.title }} | {{ SITENAME }} {{ article.title }} | {{ SITENAME }}
{% set TITLE =1 %} {% set TITLE =1 %}
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
{% if article.translate %} {% if article.translate %}
<link rel="alternate" href="{{ SUBSITEURL }}/blog/{{ article.translate }}" hreflang="es" /> <link rel="alternate" href="{{ SUBSITEURL }}/blog/{{ article.translate }}" hreflang="es" />
{% endif %} {% endif %}
{% else %} {% elif DEFAULT_LANG == "es" %}
<link rel="alternate" href="{{ SITEURL }}/{{ article.url }}" hreflang="es" /> <link rel="alternate" href="{{ SITEURL }}/{{ article.url }}" hreflang="es" />
{% if article.translate %} {% if article.translate %}
<link rel="alternate" href="{{ SUBSITEURL }}/blog/{{ article.translate }}" hreflang="en-us" /> <link rel="alternate" href="{{ SUBSITEURL }}/blog/{{ article.translate }}" hreflang="en-us" />
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}"> <header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header"> <!--style="background-image: url('/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png');" >--> <header class="intro-header"> <!--style="background-image: url('/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png');" >-->
<a href="{{ SITEURL }}/"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png" alt="{{ gettext('Young hacker smiling') }}"></a> <a href="{{ SITEURL }}/"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png" alt="{{ gettext('Header-img-alt') }}"></a>
{% endif %} {% endif %}
</header> </header>
{% endblock header %} {% endblock header %}
...@@ -60,9 +60,9 @@ ...@@ -60,9 +60,9 @@
<div class="nav-info"> <div class="nav-info">
<div class="breadcrumbs"> <div class="breadcrumbs">
<ul> <ul>
<li><a href="{{ SITEURL }}/">{{ gettext('Home') }} >>&nbsp;</a></li> <li><a href="{{ SITEURL }}/">{{ gettext('Breadcrumb-0') }} >>&nbsp;</a></li>
<li><a href="{{SITEURL}}/blog/">Blog >>&nbsp;</a></li> <li><a href="{{SITEURL}}/blog/">Blog >>&nbsp;</a></li>
<li><a href="{{SITEURL}}/{{ category.url }}../">{{ gettext('Categories') }} >>&nbsp;</a></li> <li><a href="{{SITEURL}}/{{ category.url }}../">{{ gettext('Articles-breadcrumb-1') }} >>&nbsp;</a></li>
<li><a href="{{ SITEURL }}/{{ category.url }}">{{ article.category|replace("-", " ") }}</a></li> <li><a href="{{ SITEURL }}/{{ category.url }}">{{ article.category|replace("-", " ") }}</a></li>
</ul> </ul>
</div> </div>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/es.png" alt="Spain flag"><a href="{{ SUBSITEURL }}/blog/{{ article.translate }}" class="button">Translate >></a> <img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/es.png" alt="Spain flag"><a href="{{ SUBSITEURL }}/blog/{{ article.translate }}" class="button">Translate >></a>
</div> </div>
{% endif %} {% endif %}
{% else %} {% elif DEFAULT_LANG == "es" %}
{% if article.translate %} {% if article.translate %}
<div class="translate"> <div class="translate">
<img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/en.png" alt="Bandera de Estados Unidos"><a href="{{ SUBSITEURL }}/blog/{{ article.translate }}" class="button">Traducir >></a> <img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/en.png" alt="Bandera de Estados Unidos"><a href="{{ SUBSITEURL }}/blog/{{ article.translate }}" class="button">Traducir >></a>
...@@ -88,43 +88,24 @@ ...@@ -88,43 +88,24 @@
<tr> <tr>
<td class="meta-data"> <td class="meta-data">
{% for author in article.authors %} {% for author in article.authors %}
<img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/user.png" alt="{{ gettext('User icon') }}"><a href="../../{{ author.url }}">{{ author }}</a> <img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/user.png" alt="{{ gettext('Articles-icon-alt-1') }}"><a href="../../{{ author.url }}">{{ author }}</a>
{% endfor %}<br/> {% endfor %}<br/>
</td> </td>
<td class="meta-data"> <td class="meta-data">
<img src="{{ SITEURL}}/{{ THEME_STATIC_DIR }}/images/comment.png" alt="{{ gettext('Dialog box icon') }}"><a href="./#disqus_thread">{{ gettext('Comment') }}</a><br/> <img src="{{ SITEURL}}/{{ THEME_STATIC_DIR }}/images/comment.png" alt="{{ gettext('Articles-icon-alt-2') }}"><a href="./#disqus_thread">{{ gettext('Articles-icon-msg-1') }}</a><br/>
</td> </td>
<td class="meta-data"> <td class="meta-data">
<img src="{{ SITEURL}}/{{ THEME_STATIC_DIR }}/images/folder.png" alt="{{ gettext('Folder icon') }}"><a href="../../{{ category.url }}">{{ article.category|replace("-", " ") }}</a><br/> <img src="{{ SITEURL}}/{{ THEME_STATIC_DIR }}/images/folder.png" alt="{{ gettext('Articles-icon-alt-3') }}"><a href="../../{{ category.url }}">{{ article.category|replace("-", " ") }}</a><br/>
</td> </td>
<td class="meta-data"> <td class="meta-data">
<img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/calendar2.png" alt="{{ gettext('Calendar icon') }}"><p>{{ article.locale_date }}</p><br/> <img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/calendar2.png" alt="{{ gettext('Articles-icon-alt-4') }}"><p>{{ article.locale_date }}</p><br/>
</td> </td>
<!--
{% if DEFAULT_LANG == "en" %}
{% if article.translate %}
<td class="meta-data">
<a href="{{ SUBSITEURL }}/blog/{{ article.translate }}"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/es.png" alt="Spain flag"></a>
</td>
{% endif %}
{% else %}
{% if article.translate %}
<td class="meta-data">
<a href="{{ SUBSITEURL }}/blog/{{ article.translate }}"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/en.png" alt="Bandera de Estados Unidos"></a>
</td>
{% endif %}
{% endif %} -->
</tr> </tr>
</table> </table>
{% if article.modified %}
<span class="meta">{{ gettext('Updated on') }} {{ article.locale_modified }}</span>
{% endif %}
{% import 'translations.html' as translations with context %}
{{ translations.translations_for(article) }}
{{ article.content }} {{ article.content }}
<br/> <br/>
<div class="authorimg"> <div class="authorimg">
<img class="imgwriter" src="{{ SITEURL }}/images/authors/{{ article.writer }}.png" alt="{{ gettext('Author picture') }}"> <img class="imgwriter" src="{{ SITEURL }}/images/authors/{{ article.writer }}.png" alt="{{ gettext('Articles-author-alt') }}">
</div> </div>
<table class="authorinfo"> <table class="authorinfo">
<tr><td> <tr><td>
...@@ -139,7 +120,7 @@ ...@@ -139,7 +120,7 @@
</table> </table>
<br/> <br/>
{% if article.related_posts %} {% if article.related_posts %}
<h4>{{ gettext('Related') }}</h4> <h4>{{ gettext('Articles-related-sect') }}</h4>
<section class="sect-related"> <section class="sect-related">
{% for related_post in article.related_posts %} {% for related_post in article.related_posts %}
<div class="related"> <div class="related">
...@@ -176,7 +157,7 @@ ...@@ -176,7 +157,7 @@
{% if DISQUS_SITENAME and SITEURL %} {% if DISQUS_SITENAME and SITEURL %}
<hr class="hrcoments"> <hr class="hrcoments">
<div class="comments"> <div class="comments">
<h3>{{ gettext('Leave a comment') }}</h3> <h3>{{ gettext('Articles-disqus-sect') }}</h3>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
{% if DEFAULT_LANG == "es" %} {% if DEFAULT_LANG == "es" %}
<script type="text/javascript"> <script type="text/javascript">
...@@ -192,7 +173,7 @@ ...@@ -192,7 +173,7 @@
(d.head || d.body).appendChild(dsq); (d.head || d.body).appendChild(dsq);
})(); })();
</script> </script>
{% else %} {% elif DEFAULT_LANG == "en" %}
<script type="text/javascript"> <script type="text/javascript">
var disqus_config = function () { var disqus_config = function () {
this.page.identifier = "{{ article.slug }}"; this.page.identifier = "{{ article.slug }}";
......
{% extends "index.html" %} {% extends "index.html" %}
{% block meta %} {% block meta %}
<meta name="keywords" content="{{ gettext('Here you can find all the articles written by the author') }} {{ author }}.{{ gettext('The articles are ordered by publishing date, starting with the last one. They offer information about the different topics in the field of Information Security.') }}"> <meta name="description" content="{{ gettext('Author-metadescription-1') }} {{ author }}.{{ gettext('Author-metadescription-2') }}">
<meta name="description" content="{{ gettext('Author, Article, Information, Security, Blog, Publising, Date') }}"> <meta name="keywords" content="{{ gettext('Author-keywords') }}">
{% endblock meta %} {% endblock meta %}
{% block title %}{{ gettext('Articles by') }} {{ author }} | {{ AUTHOR }}{% endblock %} {% block title %}{{ gettext('Articles-title') }} {{ author }} | {{ AUTHOR }}{% endblock %}
{% block canonical %}<link rel="canonical" href="{{ SITEURL }}/{{ author.url }}">{% endblock canonical %} {% block canonical %}<link rel="canonical" href="{{ SITEURL }}/{{ author.url }}">{% endblock canonical %}
{% block language %} {% block language %}
{% if DEFAULT_LANG == "en" %} {% if DEFAULT_LANG == "en" %}
<link rel="alternate" href="{{ SITEURL }}/{{ author.url}}" hreflang="en-us" /> <link rel="alternate" href="{{ SITEURL }}/{{ author.url}}" hreflang="en-us" />
{% else %} {% elif DEFAULT_LANG == "es" %}
<link rel="alternate" href="{{ SITEURL }}/{{ author.url}}" hreflang="es" /> <link rel="alternate" href="{{ SITEURL }}/{{ author.url}}" hreflang="es" />
{% endif %} {% endif %}
{% endblock language %} {% endblock language %}
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}"> <header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header"> <!--style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png');" >--> <header class="intro-header"> <!--style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png');" >-->
<a href="{{ SITEURL }}/"><img src= "{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png" alt="{{ gettext('Young hacker smiling') }}"></a> <a href="{{ SITEURL }}/"><img src= "{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png" alt="{{ gettext('Header-img-alt') }}"></a>
{% endif %} {% endif %}
</header> </header>
<div class="list-title"> <div class="list-title">
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
<div class="nav-info"> <div class="nav-info">
<div class="breadcrumbs"> <div class="breadcrumbs">
<ul> <ul>
<li><a href="{{ SITEURL }}/">{{ gettext('Home') }} >>&nbsp;</a></li> <li><a href="{{ SITEURL }}/">{{ gettext('Breadcrumb-0') }} >>&nbsp;</a></li>
<li><a href="{{ SITEURL }}/blog/">Blog >>&nbsp;</a></li> <li><a href="{{ SITEURL }}/blog/">Blog >>&nbsp;</a></li>
<li><a href="../">{{ gettext('Authors') }}</a></li> <li><a href="../">{{ gettext('Author-breadcrumb-1') }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
......
{% extends "base.html" %} {% extends "base.html" %}
{% block meta %} {% block meta %}
<meta name="keywords" content="{{ gettext('Here you can find the list of all the authors that have contributed to the blog by publishing an article which may have an opinion, a solution to a challenge, or just general information related to many topics in the field of Information Security') }}."> <meta name="description" content="{{ gettext('Authors-metadescription') }}.">
<meta name="description" content="{{ gettext('Authors, Blog, Publish, Article, Information, Security') }}"> <meta name="keywords" content="{{ gettext('Authors-keywords') }}">
{% endblock meta %} {% endblock meta %}
{% block title %}{{ gettext('Authors') }} | {{ SITENAME }}{% endblock title %} {% block title %}{{ gettext('Authors-title') }} | {{ SITENAME }}{% endblock title %}
{% block canonical %}<link rel="canonical" href="{{ SITEURL }}/blog/{{ gettext('authors') }}/">{% endblock canonical %} {% block canonical %}<link rel="canonical" href="{{ SITEURL }}/blog/{{ gettext('Authors-canonical') }}/">{% endblock canonical %}
{% block language %} {% block language %}
{% if DEFAULT_LANG == "en"%} {% if DEFAULT_LANG == "en"%}
<link rel="alternate" href="{{ SITEURL }}/blog/authors/" hreflang="en-us" /> <link rel="alternate" href="{{ SITEURL }}/blog/authors/" hreflang="en-us" />
<link rel="alternate" href="{{ SUBSITEURL }}/blog/{{ gettext('authors') }}/" hreflang="es" /> <link rel="alternate" href="{{ SUBSITEURL }}/blog/autores/" hreflang="es" />
{% else %} {% elif DEFAULT_LANG == "es" %}
<link rel="alternate" href="{{ SITEURL }}/blog/autores" hreflang="es" /> <link rel="alternate" href="{{ SITEURL }}/blog/autores/" hreflang="es" />
<link rel="alternate" href="{{ SUBSITEURL }}/blog/{{ gettext('autores') }}/" hreflang="en-us" /> <link rel="alternate" href="{{ SUBSITEURL }}/blog/authors/" hreflang="en-us" />
{% endif %} {% endif %}
{% endblock language %} {% endblock language %}
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}"> <header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header"> <!--style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png');" >--> <header class="intro-header"> <!--style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png');" >-->
<a href="{{ SITEURL }}/"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png" alt="{{ gettext('Young hacker smiling') }}"></a> <a href="{{ SITEURL }}/"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png" alt="{{ gettext('Header-img-alt') }}"></a>
{% endif %} {% endif %}
</header> </header>
{% endblock header %} {% endblock header %}
...@@ -38,12 +38,12 @@ ...@@ -38,12 +38,12 @@
<div class="nav-info"> <div class="nav-info">
<div class="breadcrumbs"> <div class="breadcrumbs">
<ul> <ul>
<li><a href="{{ SITEURL }}/">{{ gettext('Home') }} >>&nbsp;</a></li> <li><a href="{{ SITEURL }}/">{{ gettext('Breadcrumb-0') }} >>&nbsp;</a></li>
<li><a href="{{ SITEURL }}/blog/">Blog</a></li> <li><a href="{{ SITEURL }}/blog/">Blog</a></li>
</ul> </ul>
</div> </div>
</div> </div>
<h1>{{ gettext('Authors') }}:</h1> <h1>{{ gettext('Authors-header') }}:</h1>
<div class="preamble"> <div class="preamble">
<div class="itemlist"> <div class="itemlist">
<ul> <ul>
......
{% extends "base.html" %} {% extends "base.html" %}
{% block meta %} {% block meta %}
<meta name="keywords" content="{{ gettext('Here you can find the list of categories used to classify the articles of the blog. They are all related to the field of Information Security and may range from an opinion related to a certain topic, or a solution to a challenge, all the way to just general information') }}"> <meta name="description" content="{{ gettext('Categories-metadescription') }}">
<meta name="description" content="Category, Classify, Articles, Blog, Information, Security"> <meta name="keywords" content="{{ gettext('Categories-keywords') }}">
{% endblock meta %} {% endblock meta %}
{% block title %}{{ gettext('Categories') }} | {{ SITENAME }}{% endblock %} {% block title %}{{ gettext('Categories-title') }} | {{ SITENAME }}{% endblock %}
{% block canonical %}<link rel="canonical" href="{{ SITEURL }}/{{ gettext('categories') }}/">{% endblock canonical %} {% block canonical %}<link rel="canonical" href="{{ SITEURL }}/{{ gettext('Categories-canonical') }}/">{% endblock canonical %}
{% block language %} {% block language %}
{% if DEFAULT_LANG == "en" %} {% if DEFAULT_LANG == "en" %}
<link rel="alternate" href="{{ SITEURL }}/blog/categories/" hreflang="en-us" /> <link rel="alternate" href="{{ SITEURL }}/blog/categories/" hreflang="en-us" />
<link rel="alternate" href="{{ SUBSITEURL }}/blog/{{ gettext('categories') }}/" hreflang="es" /> <link rel="alternate" href="{{ SUBSITEURL }}/blog/categorias/" hreflang="es" />
{% else %} {% elif DEFAULT_LANG == "es" %}
<link rel="alternate" href="{{ SITEURL }}/blog/categorias/" hreflang="es" /> <link rel="alternate" href="{{ SITEURL }}/blog/categorias/" hreflang="es" />
<link rel="alternate" href="{{ SUBSITEURL }}/blog/{{ gettext('categorias') }}/" hreflang="en-us" /> <link rel="alternate" href="{{ SUBSITEURL }}/blog/categories/" hreflang="en-us" />
{% endif %} {% endif %}
{% endblock language %} {% endblock language %}
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}"> <header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header"> <!--style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png');" >--> <header class="intro-header"> <!--style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png');" >-->
<a href="{{ SITEURL }}/"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png" alt="{{ gettext('Young hacker smiling') }}"></a> <a href="{{ SITEURL }}/"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png" alt="{{ gettext('Header-img-alt') }}"></a>
{% endif %} {% endif %}
</header> </header>
{% endblock header %} {% endblock header %}
...@@ -38,12 +38,12 @@ ...@@ -38,12 +38,12 @@
<div class="nav-info"> <div class="nav-info">
<div class="breadcrumbs"> <div class="breadcrumbs">
<ul> <ul>
<li><a href="{{ SITEURL }}/">{{ gettext('Home') }} >>&nbsp;</a></li> <li><a href="{{ SITEURL }}/">{{ gettext('Breadcrumb-0') }} >>&nbsp;</a></li>
<li><a href="{{ SITEURL }}/blog/">Blog</a></li> <li><a href="{{ SITEURL }}/blog/">Blog</a></li>
</ul> </ul>
</div> </div>
</div> </div>
<h1>{{ gettext('Categories') }}:</h1> <h1>{{ gettext('Categories-header') }}:</h1>
<div class="preamble"> <div class="preamble">
<div class="itemlist"> <div class="itemlist">
<ul> <ul>
......
{% extends "index.html" %} {% extends "index.html" %}
{% block meta %} {% block meta %}
<meta name="keywords" content="{{ gettext('Here you can find all the articles of the blog which are related to the category') }} {{ category.name|replace('-', ' ')|capitalize }}. {{ gettext('The articles are ordered according to their publishing date and may address different subjets related to the field of Information Security') }}."> <meta name="description" content="{{ gettext('Category-metadescription-1') }} {{ category.name|replace('-', ' ')|capitalize }}. {{ gettext('Category-metadescription-2') }}.">
<meta name="description" content="{{ gettext('Article, Category, Blog, Information, Security, Date') }}"> <meta name="keywords" content="{{ gettext('Category-keywords') }}">
{% endblock meta %} {% endblock meta %}
{% block title %}{{ gettext('Articles in the category') }} {{ category.name|replace("-", " ")|capitalize }} | {{ AUTHOR }}{% endblock %} {% block title %}{{ gettext('Category-title') }} {{ category.name|replace("-", " ")|capitalize }} | {{ AUTHOR }}{% endblock %}
{% block canonical %}<link rel="canonical" href="{{ SITEURL }}/{{ category.url }}">{% endblock canonical %} {% block canonical %}<link rel="canonical" href="{{ SITEURL }}/{{ category.url }}">{% endblock canonical %}
{% block language %} {% block language %}
{% if DEFAULT_LANG == "en" %} {% if DEFAULT_LANG == "en" %}
<link rel="alternate" href="{{ SITEURL }}/{{ category.url }}" hreflang="en-us" /> <link rel="alternate" href="{{ SITEURL }}/{{ category.url }}" hreflang="en-us" />
{% else %} {% elif DEFAULT_LANG == "es" %}
<link rel="alternate" href="{{ SITEURL }}/{{ category.url }}" hreflang="es" /> <link rel="alternate" href="{{ SITEURL }}/{{ category.url }}" hreflang="es" />
{% endif %} {% endif %}
{% endblock language %} {% endblock language %}
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<header class="intro-header" style="background-color: {{ HEADER_COLOR }}"> <header class="intro-header" style="background-color: {{ HEADER_COLOR }}">
{% else %} {% else %}
<header class="intro-header"> <!--style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png');" >--> <header class="intro-header"> <!--style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png');" >-->
<a href="{{ SITEURL }}/"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png" alt="{{ gettext('Young hacker smiling') }}"></a> <a href="{{ SITEURL }}/"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/fluid-{{ DEFAULT_LANG }}.png" alt="{{ gettext('Header-img-alt') }}"></a>
{% endif %} {% endif %}
</header> </header>
<div class="list-title"> <div class="list-title">
...@@ -35,9 +35,9 @@ ...@@ -35,9 +35,9 @@
<div class="nav-info"> <div class="nav-info">
<div class="breadcrumbs"> <div class="breadcrumbs">
<ul> <ul>
<li><a href="{{ SITEURL }}/">{{ gettext('Home') }} >>&nbsp;</a></li> <li><a href="{{ SITEURL }}/">{{ gettext('Breadcrumb-0') }} >>&nbsp;</a></li>
<li><a href="{{ SITEURL }}/blog/">Blog >>&nbsp;</a></li> <li><a href="{{ SITEURL }}/blog/">Blog >>&nbsp;</a></li>
<li><a href="../">{{ gettext('Categories') }}</a></li> <li><a href="../">{{ gettext('Category-breadcrumb-1') }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
......
{% if DISQUS_SITENAME %}<p>{{ gettext('There are') }} <a data-disqus-identifier="{{ article.url }}" href="{{ SITEURL }}/{{ article.url }}#disqus_thread">{{ gettext('comments') }}</a>.</p>{% endif %} {% if DISQUS_SITENAME %}<p>{{ gettext('Comment-msg-1') }} <a data-disqus-identifier="{{ article.url }}" href="{{ SITEURL }}/{{ article.url }}#disqus_thread">{{ gettext('Comment-msg-2') }}</a>.</p>{% endif %}
{% extends "base.html" %} {% extends "base.html" %}
{% block meta %} {% block meta %}
<meta name="keywords" content="{{ gettext('An error occured. The page you requested does not exist or is not available at the moment. Here you can find links to most of the relevant content of the website') }}."> <meta name="description" content="{{ gettext('Error-metadescription') }}.">
<meta name="description" content="{{ gettext('Error, Request, Page, Availability, Links, Content') }}"> <meta name="keywords" content="{{ gettext('Error-keywords') }}">
{% endblock meta %} {% endblock meta %}
{% block title %} {% block title %}
{% if DEFAULT_LANG == "en" %} {% if DEFAULT_LANG == "en" %}
{{ gettext('The page was not found') }} | {{ SITENAME }} {{ gettext('Error-title') }} | {{ SITENAME }}
{% else %} {% elif DEFAULT_LANG == "es" %}
{{ gettext('The page was not found') }} | {{ AUTHOR }} {{ gettext('Error-title') }} | {{ AUTHOR }}
{% endif %} {% endif %}
{% endblock title %} {% endblock title %}
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
{% if DEFAULT_LANG == "en" %} {% if DEFAULT_LANG == "en" %}
<link rel="alternate" href="{{ SITEURL }}/error/" hreflang="en-us" />