diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fdca2d4..90e316b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +## [3.3.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.5) + +### Enhancements + +- Add English default text `site.locale` strings [#407](https://github.com/mmistakes/minimal-mistakes/issues/407) +- Add Portuguese localized UI text. [#411](https://github.com/mmistakes/minimal-mistakes/pull/411) +- Add Italian localized UI text. [#409](https://github.com/mmistakes/minimal-mistakes/pull/409) + +### Bug Fixes + +### Maintenance + +- Remove unused Google AdSense variables in `_config.yml` [#404](https://github.com/mmistakes/minimal-mistakes/issues/404) +- Update `Gemfile` instructions for using `github-pages` vs. native `jekyll` gems. +- Disable `gems:` in `_config.yml` and enable plugins with Bundler instead. +- Add `repository` to `_config.yml` to suppress GitHub Pages error `Liquid Exception: No repo name found.` + ## [3.3.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.4) ### Enhancements diff --git a/Gemfile b/Gemfile index 62e0820d..6c08bcf0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,24 @@ source "https://rubygems.org" -gem "github-pages" -# gem "jekyll-archives" -gem "wdm", "~> 0.1.0" if Gem.win_platform? \ No newline at end of file +# Hello! This is where you manage which Jekyll version is used to run. +# When you want to use a different version, change it below, save the +# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: +# +# bundle exec jekyll serve +# +# This will help ensure the proper Jekyll version is running. +# Happy Jekylling! + +gem "github-pages", group: :jekyll_plugins + +# If you want to use Jekyll native, uncomment the line below. +# To upgrade, run `bundle update`. + +# gem "jekyll" + +gem "wdm", "~> 0.1.0" if Gem.win_platform? + +# If you have any plugins, put them here! +group :jekyll_plugins do + # gem "jekyll-archives" +end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 533608b0..6a5ea60a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,7 +21,7 @@ GEM ffi (1.9.14) ffi (1.9.14-x64-mingw32) gemoji (2.1.0) - github-pages (88) + github-pages (89) activesupport (= 4.2.7) github-pages-health-check (= 1.1.0) jekyll (= 3.1.6) @@ -35,7 +35,7 @@ GEM jekyll-sass-converter (= 1.3.0) jekyll-seo-tag (= 2.0.0) jekyll-sitemap (= 0.10.0) - jemoji (= 0.6.2) + jemoji (= 0.7.0) kramdown (= 1.11.1) liquid (= 3.0.6) listen (= 3.0.6) @@ -82,7 +82,8 @@ GEM jekyll-sitemap (0.10.0) jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) - jemoji (0.6.2) + jemoji (0.7.0) + activesupport (~> 4.0) gemoji (~> 2.0) html-pipeline (~> 2.2) jekyll (>= 3.0) diff --git a/_config.yml b/_config.yml index bd2e2f08..319edecf 100644 --- a/_config.yml +++ b/_config.yml @@ -13,7 +13,7 @@ name : "Your Name" description : "An amazing website." url : # the base hostname & protocol for your site e.g. "https://mmistakes.github.io" baseurl : # the subpath of your site, e.g. "/blog" -gh_repo : +repository : # GitHub username/repo-name e.g. "mmistakes/minimal-mistakes" teaser : # filename of teaser fallback teaser image placed in /images/, .e.g. "500x300.png" # breadcrumbs : false # true, false (default) words_per_minute : 200 @@ -58,10 +58,6 @@ analytics: google: tracking_id : -# Google AdSense -google_ad_client : -google_ad_slot : - # Site Author author: @@ -157,20 +153,20 @@ timezone: # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones # Plugins -gems: - - jekyll-paginate - - jekyll-sitemap - - jekyll-gist - - jekyll-feed - - jemoji +# gems: +# - jekyll-paginate +# - jekyll-sitemap +# - jekyll-gist +# - jekyll-feed +# - jemoji # mimic GitHub Pages with --safe -whitelist: - - jekyll-paginate - - jekyll-sitemap - - jekyll-gist - - jekyll-feed - - jemoji +# whitelist: +# - jekyll-paginate +# - jekyll-sitemap +# - jekyll-gist +# - jekyll-feed +# - jemoji # Archives @@ -207,4 +203,4 @@ tag_archive: compress_html: clippings: all ignore: - envs: development + envs: development \ No newline at end of file diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 9b80757d..13addada 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -132,6 +132,67 @@ tr: &DEFAULT_TR tr-TR: <<: *DEFAULT_TR +# Brazilian Portguese +# ----------------- +pt: &DEFAULT_PT + page : "Página" + pagination_previous : "Anterior" + pagination_next : "Próxima" + breadcrumb_home_label : "Home" + breadcrumb_separator : "/" + toc_label : "Nesta página" + ext_link_label : "Link direto" + less_than : "meno que" + minute_read : "minutos de leitura" + share_on_label : "Compartilhe em" + meta_label : + tags_label : "Tags:" + categories_label : "Categorias:" + date_label : "Atualizado em:" + comments_label : "Deixe um comentário" + more_label : "Aprenda Mais" + related_label : "Você Talvez Goste Também" + follow_label : "Acompanhe em" + feed_label : "Feed" + powered_by : "Feito com" + website_label : "Site" + email_label : "Email" + recent_posts : "Postagens recentes" + undefined_wpm : "Parâmetro indefinido em word_per_minute no _config.yml" +pt-BR: + <<: *DEFAULT_PT +pt-PT: + <<: *DEFAULT_PT + +# Italian +# ----------------- +it: &DEFAULT_IT + page : "Pagina" + pagination_previous : "Precedente" + pagination_next : "Prossima" + breadcrumb_home_label : "Home" + breadcrumb_separator : "/" + toc_label : "Indice della pagina" + ext_link_label : "Link" + less_than : "meno di" + minute_read : "minuto/i di lettura" + share_on_label : "Condividi" + meta_label : + tags_label : "Tags:" + categories_label : "Categorie:" + date_label : "Aggiornato:" + comments_label : "Scrivi un commento" + more_label : "Scopri di più" + related_label : "Potrebbe Piacerti Anche" + follow_label : "Segui:" + feed_label : "Feed" + powered_by : "Powered by" + website_label : "Website" + email_label : "Email" + recent_posts : "Articoli Recenti" + undefined_wpm : "Parametro words_per_minute non definito in _config.yml" +it-IT: + <<: *DEFAULT_IT # Another locale # -------------- diff --git a/_includes/author-profile.html b/_includes/author-profile.html index d07979f3..5fd8eecb 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -26,10 +26,10 @@
  • {{ author.location }}
    • {% endif %} {% if author.uri %} -
  • {{ site.data.ui-text[site.locale].website_label }}
    • +
  • {{ site.data.ui-text[site.locale].website_label | default: "Website" }}
    • {% endif %} {% if author.email %} -
  • {{ site.data.ui-text[site.locale].email_label }}
    • +
  • {{ site.data.ui-text[site.locale].email_label | default: "Email" }}
    • {% endif %} {% if author.keybase %}
  • Keybase
    • diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html index ded8bd6e..2b9f7a9e 100644 --- a/_includes/breadcrumbs.html +++ b/_includes/breadcrumbs.html @@ -21,10 +21,10 @@ {% for crumb in crumbs offset: 1 %} {% if forloop.first %}
  • - {{ site.data.ui-text[site.locale].breadcrumb_home_label }} + {{ site.data.ui-text[site.locale].breadcrumb_home_label | default: "Home" }}
    • - {{ site.data.ui-text[site.locale].breadcrumb_separator }} + {{ site.data.ui-text[site.locale].breadcrumb_separator | default: "/" }} {% endif %} {% if forloop.last %}
  • {{ page.title }}
    • @@ -34,7 +34,7 @@ {{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }} - {{ site.data.ui-text[site.locale].breadcrumb_separator }} + {{ site.data.ui-text[site.locale].breadcrumb_separator | default: "/" }} {% endif %} {% endfor %} diff --git a/_includes/category-list.html b/_includes/category-list.html index 77b13547..a2a623e5 100644 --- a/_includes/category-list.html +++ b/_includes/category-list.html @@ -18,7 +18,7 @@ {% assign category_hashes = (page_categories | split: ',' | sort:0) %}

    - {{ site.data.ui-text[site.locale].categories_label }} + {{ site.data.ui-text[site.locale].categories_label | default: "Categories:" }} {% for hash in category_hashes %} {% assign keyValue = hash | split: '#' %} diff --git a/_includes/comments.html b/_includes/comments.html index 03a8c64c..a01af60f 100644 --- a/_includes/comments.html +++ b/_includes/comments.html @@ -1,7 +1,7 @@ {% include base_path %}

    -

    {{ site.data.ui-text[site.locale].comments_label }}

    +

    {{ site.data.ui-text[site.locale].comments_label | default: "Leave a Comment" }}

    {% case site.comments.provider %} {% when "disqus" %}
    diff --git a/_includes/feature_row b/_includes/feature_row index 10592b7e..b84f36b2 100644 --- a/_includes/feature_row +++ b/_includes/feature_row @@ -42,7 +42,7 @@ {% endif %} {% if f.url %} -

    {{ f.btn_label | default: site.data.ui-text[site.locale].more_label }}

    +

    {{ f.btn_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}

    {% endif %}
    diff --git a/_includes/footer.html b/_includes/footer.html index a0ffe60e..53b99eb0 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -17,8 +17,8 @@ {% if site.author.bitbucket %}
  • Bitbucket
    • {% endif %} -
  • {{ site.data.ui-text[site.locale].feed_label }}
    • +
  • {{ site.data.ui-text[site.locale].feed_label | default: "Feed" }}
    • -
    © {{ site.time | date: '%Y' }} {{ site.name | default: site.title }}. {{ site.data.ui-text[site.locale].powered_by }} Jekyll & Minimal Mistakes.
    \ No newline at end of file +
    © {{ site.time | date: '%Y' }} {{ site.name | default: site.title }}. {{ site.data.ui-text[site.locale].powered_by | default: "Powered by" }} Jekyll & Minimal Mistakes.
    \ No newline at end of file diff --git a/_includes/page__hero.html b/_includes/page__hero.html index 6cc1ee7e..cd0fa9fd 100644 --- a/_includes/page__hero.html +++ b/_includes/page__hero.html @@ -31,7 +31,7 @@

    {% if paginator %} - {{ site.title }}{% unless paginator.page == 1 %} {{ site.data.ui-text[site.locale].page }} {{ paginator.page }}{% endunless %} + {{ site.title }}{% unless paginator.page == 1 %} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %} {% else %} {{ page.title | default: site.title | markdownify | remove: "

    " | remove: "

    " }} {% endif %} @@ -43,7 +43,7 @@

    {% include read-time.html %}

    {% endif %} {% if page.header.cta_url %} -

    {{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label }}

    +

    {{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}

    {% endif %}

    {% else %} diff --git a/_includes/paginator.html b/_includes/paginator.html index 92450bbd..2924f9a8 100644 --- a/_includes/paginator.html +++ b/_includes/paginator.html @@ -6,12 +6,12 @@ {% comment %} Link for previous page {% endcomment %} {% if paginator.previous_page %} {% if paginator.previous_page == 1 %} -
  • {{ site.data.ui-text[site.locale].pagination_previous }}
    • +
  • {{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}
    • {% else %} -
  • {{ site.data.ui-text[site.locale].pagination_previous }}
    • +
  • {{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}
    • {% endif %} {% else %} -
    • +
    • {% endif %} {% comment %} First page {% endcomment %} @@ -61,9 +61,9 @@ {% comment %} Link next page {% endcomment %} {% if paginator.next_page %} -
  • {{ site.data.ui-text[site.locale].pagination_next }}
    • +
  • {{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}
    • {% else %} -
    • +
    • {% endif %} diff --git a/_includes/post_pagination.html b/_includes/post_pagination.html index 0a3acac5..cb2005ea 100644 --- a/_includes/post_pagination.html +++ b/_includes/post_pagination.html @@ -3,14 +3,14 @@ {% if page.previous or page.next %} {% endif %} \ No newline at end of file diff --git a/_includes/read-time.html b/_includes/read-time.html index 605dc0bc..a45043c1 100644 --- a/_includes/read-time.html +++ b/_includes/read-time.html @@ -6,12 +6,12 @@ {% if site.words_per_minute %} {% if words < 180 %} - {{ site.data.ui-text[site.locale].less_than }} 1 {{ site.data.ui-text[site.locale].minute_read }} + {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} {% elsif words < 360 %} - 1 {{ site.data.ui-text[site.locale].minute_read }} + 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} {% else %} - {{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minute_read }} + {{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} {% endif %} {% else %} - {{ site.data.ui-text[site.locale].undefined_wpm }} + {{ site.data.ui-text[site.locale].undefined_wpm | "Undefined parameter words_per_minute at _config.yml" }} {% endif %} \ No newline at end of file diff --git a/_includes/seo.html b/_includes/seo.html index 8189a8ad..a43115b9 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -18,7 +18,7 @@ {% assign canonical_url = page.url | replace: "index.html", "" | prepend: site.url %} {% endif %} -{{ seo_title | default: site.title }}{% if paginator %}{% unless paginator.page == 1 %} {{ site.title_separator }} {{ site.data.ui-text[site.locale].page }} {{ paginator.page }}{% endunless %}{% endif %} +{{ seo_title | default: site.title }}{% if paginator %}{% unless paginator.page == 1 %} {{ site.title_separator }} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}{% endif %} {% assign seo_description = page.description | default: page.excerpt | default: site.description %} {% if seo_description %} @@ -39,7 +39,7 @@ {% assign seo_author_twitter = seo_author_twitter | replace: "@", "" %} {% endif %} - + diff --git a/_includes/social-share.html b/_includes/social-share.html index b2842865..718e6f97 100644 --- a/_includes/social-share.html +++ b/_includes/social-share.html @@ -2,14 +2,14 @@
    {% if site.data.ui-text[site.locale].share_on_label %} -

    {{ site.data.ui-text[site.locale].share_on_label }}

    +

    {{ site.data.ui-text[site.locale].share_on_label | default: "Share on" }}

    {% endif %} - Twitter + Twitter - Facebook + Facebook - Google+ + Google+ - LinkedIn + LinkedIn
    \ No newline at end of file diff --git a/_includes/tag-list.html b/_includes/tag-list.html index 6e801f25..80fcff3e 100644 --- a/_includes/tag-list.html +++ b/_includes/tag-list.html @@ -16,7 +16,7 @@ {% assign tag_hashes = (page_tags | split: ',' | sort:0) %}

    - {{ site.data.ui-text[site.locale].tags_label }} + {{ site.data.ui-text[site.locale].tags_label | default: "Tags:" }} {% for hash in tag_hashes %} {% assign keyValue = hash | split: '#' %} diff --git a/_layouts/single.html b/_layouts/single.html index 8c5fd0f8..3629aa62 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -35,7 +35,7 @@ layout: default

    {{ content }} - {% if page.link %}
    {{ site.data.ui-text[site.locale].ext_link_label }}
    {% endif %} + {% if page.link %}
    {{ site.data.ui-text[site.locale].ext_link_label | default: "Direct Link" }}
    {% endif %}
    @@ -64,7 +64,7 @@ layout: default {% if page.id and page.related and site.related_posts.size > 0 %}
    {% if site.data.ui-text[site.locale].related_label %} -

    {{ site.data.ui-text[site.locale].related_label }}

    +

    {{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}

    {% endif %}
    {% for post in site.related_posts limit:4 %} diff --git a/index.html b/index.html index 1a202656..1bea9770 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ author_profile: true {% include base_path %} -

    {{ site.data.ui-text[site.locale].recent_posts }}

    +

    {{ site.data.ui-text[site.locale].recent_posts | default: "Recent Posts" }}

    {% for post in paginator.posts %} {% include archive-single.html %} diff --git a/package.json b/package.json index 5a08f2c3..8dcb5d66 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minimal-mistakes", - "version": "3.3.4", + "version": "3.3.5", "description": "Minimal Mistakes Jekyll theme npm build scripts", "repository": { "type": "git",