diff options
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/header.liquid | 2 | ||||
| -rw-r--r-- | _includes/language_select_button.liquid | 14 | ||||
| -rw-r--r-- | _includes/navigation.liquid | 28 | ||||
| -rw-r--r-- | _includes/navigation_buttons.liquid | 8 | ||||
| -rw-r--r-- | _includes/pagination.liquid | 10 | ||||
| -rw-r--r-- | _includes/recent_posts.liquid | 2 |
6 files changed, 32 insertions, 32 deletions
diff --git a/_includes/header.liquid b/_includes/header.liquid index b3c3d34..e303e4b 100644 --- a/_includes/header.liquid +++ b/_includes/header.liquid @@ -7,7 +7,7 @@ <meta charset="UTF-8"> <title>{{ site.name }}</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link href="{{ site.baseurl }}/assets/css/bulma.min.css" rel="stylesheet" type="text/css"> + <link href="https://cdn.jsdelivr.net/npm/bulma@1.0.0/css/bulma.min.css" rel="stylesheet" type="text/css"> <link href="{{ site.baseurl }}/assets/css/styles.css" rel="stylesheet" type="text/css"> <link href="{{ site.baseurl }}/assets/css/syntax_light.css" rel="stylesheet" type="text/css"> <link href="{{ site.baseurl }}/assets/css/syntax_dark.css" rel="stylesheet" type="text/css"> diff --git a/_includes/language_select_button.liquid b/_includes/language_select_button.liquid index 2659b49..146ac68 100644 --- a/_includes/language_select_button.liquid +++ b/_includes/language_select_button.liquid @@ -1,7 +1,7 @@ <div class="dropdown is-up mr-2"> <div class="dropdown-trigger"> <button class="button btn-primary" aria-haspopup="true" id="language-select-button" aria-controls="language-selection"> - <span>{% t global.language %}</span> + <span>{{ site.data[site.active_lang].strings.global.language }}</span> <span class="icon is-small"> <i class="bi bi-chevron-up"></i> </span> @@ -9,14 +9,14 @@ </div> <div class="dropdown-menu" id="language-selection" role="menu"> <div class="dropdown-content"> - <div class="dropdown-item"> - {% capture spanish_site %}{{ site.baseurl_root }}{{ page.url}}{% endcapture %} - <a href="{{ spanish_site }}">Español</a> + <div class="dropdown-item"> + {% capture spanish_href %}{{site.baseurl}}/{% if page.permalink_lang[lang] != '/' %}{{ page.permalink_lang[lang] }}{% endif %}{% endcapture %} + <a href="{{ spanish_href }}">Español</a> </div> <hr class="dropdown-divider" /> - <div class="dropdown-item"> - {% capture english_site %}{{ site.baseurl_root }}/en{{ page.url}}{% endcapture %} - <a href="{{ english_site }}">English</a> + <div class="dropdown-item" + {% capture english_href %}{{site.baseurl}}/{{ 'en' }}{% if page.permalink_lang[lang] != '/' %}{{ page.permalink_lang[lang] }}{% endif %}{% endcapture %} + <a href="{{ english_href }}">English</a> </div> </div> </div> diff --git a/_includes/navigation.liquid b/_includes/navigation.liquid index 90319c2..b0869e7 100644 --- a/_includes/navigation.liquid +++ b/_includes/navigation.liquid @@ -1,32 +1,32 @@ <div class="column sidebar"> <div class="column sidebar-element"> <a href="{{ site.baseurl }}/now"> - {% t global.now %} + {{ site.data[site.active_lang].strings.global.now }} </a> </div> <div class="column sidebar-element"> - <a href="{{ site.baseurl }}/about"> - {% t global.about %} - </a> + <a href="{{ site.baseurl }}/about"> + {{ site.data[site.active_lang].strings.global.about }} + </a> </div> <div class="column sidebar-element"> - <a href="{{ site.baseurl }}/about_me"> - {% t global.about_me %} - </a> + <a href="{{ site.baseurl }}/about_me"> + {{ site.data[site.active_lang].strings.global.about_me }} + </a> </div> <div class="column sidebar-element"> - <a href="{{ site.baseurl }}/archive"> - {% t global.archive %} - </a> + <a href="{{ site.baseurl }}/archive"> + {{ site.data[site.active_lang].strings.global.archive }} + </a> </div> <div class="column sidebar-element"> - <a href="{{ site.baseurl }}/categories"> - {% t global.categories %} - </a> + <a href="{{ site.baseurl }}/categories"> + {{ site.data[site.active_lang].strings.global.categories }} + </a> </div> <div class="column sidebar-element"> <a href="https://git.silosneeded.com/cgit/blog.git"> - {% t global.source_code %} + {{ site.data[site.active_lang].strings.global.source_code }} </a> </div> </div> diff --git a/_includes/navigation_buttons.liquid b/_includes/navigation_buttons.liquid index f3fc319..8a7d96b 100644 --- a/_includes/navigation_buttons.liquid +++ b/_includes/navigation_buttons.liquid @@ -2,15 +2,15 @@ <div class="flex-container"> <div class="navigation-element"> {% if page.next %} - <a class="button is-info" rel="next" href="{{ page.next.url | relative_url }}"> - {% t post.next %} + <a class="button is-info" rel="next" href="{{ page.next.url | relative_url }}"> + {{ site.data[site.active_lang].strings.post.next }} </a> {% endif %} </div> <div class="navigation-element end-justified"> {% if page.previous %} - <a class="button is-info" rel="prev" href="{{ page.previous.url | relative_url }}"> - {% t post.previous %} + <a class="button is-info" rel="prev" href="{{ page.previous.url | relative_url }}"> + {{ site.data[site.active_lang].strings.post.previous }} </a> {% endif %} </div> diff --git a/_includes/pagination.liquid b/_includes/pagination.liquid index f692362..ac7a2c6 100644 --- a/_includes/pagination.liquid +++ b/_includes/pagination.liquid @@ -11,28 +11,28 @@ {% if paginator.page == 1%} <div class="column"> - <em>{% t index.first%}</em> + <em>{{ site.data[site.active_lang].strings.index.first }}</em> </div> {% else %} <div class="column"> <a href="/"> - {% t index.first %} + {{ site.data[site.active_lang].strings.index.first }} </a> </div> {% endif %} <div class="column"> - {% t index.page %} {{ paginator.page }} {% t index.of %} {{ paginator.total_pages }} + {{ site.data[site.active_lang].strings.index.page }} {{ paginator.page }} {{ site.data[site.active_lang].strings.index.of }} {{ paginator.total_pages }} </div> {% if paginator.page == paginator.total_pages %} <div class="column"> - <em>{% t index.last %}</em> + <em>{{ site.data[site.active_lang].strings.index.last }}</em> </div> {% else %} <div class="column"> <a href="{{ site.paginate_path | relative_url | replace: ':num', paginator.total_pages }}"> - {% t index.last %} + {{ site.data[site.active_lang].strings.index.last }} </a> </div> {% endif %} diff --git a/_includes/recent_posts.liquid b/_includes/recent_posts.liquid index c079d30..dc9984d 100644 --- a/_includes/recent_posts.liquid +++ b/_includes/recent_posts.liquid @@ -2,7 +2,7 @@ <div class="column sidebar mt-3"> <div class="column sidebar-element"> <span> - {% t global.recent_posts %} + {{ site.data[site.active_lang].strings.global.recent_posts }} </span> </div> {% for post in site.posts limit:5 %} |