{{post.date | localize: "%d",locale }} {{ post.date | localize: "%B",locale }} {{ post.date | localize: "%Y",locale }} | by {{ post.author }}
-{{ post.excerpt }}
-diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 25bff671a..4cd60202a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod @@ -26,7 +26,7 @@ jobs: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version-file: '.nvmrc' cache: 'npm' @@ -56,9 +56,7 @@ jobs: if: github.ref == 'refs/heads/publish' && github.event_name == 'push' steps: - name: Checkout master branch - uses: actions/checkout@v4 - - name: Checkout master branch - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: master token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/manual-deploy.yml b/.github/workflows/manual-deploy.yml index ee47d7a4b..547e1933e 100644 --- a/.github/workflows/manual-deploy.yml +++ b/.github/workflows/manual-deploy.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Ruby uses: ruby/setup-ruby@v1 @@ -33,7 +33,7 @@ jobs: bundler-cache: true - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version-file: '.nvmrc' cache: 'npm' diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index 832ce80d4..2399fd7be 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -19,10 +19,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version-file: '.nvmrc' cache: 'npm' @@ -56,10 +56,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version-file: '.nvmrc' cache: 'npm' diff --git a/.github/workflows/test-multilingual.yml b/.github/workflows/test-multilingual.yml index 9a02c1739..d2cf0477f 100644 --- a/.github/workflows/test-multilingual.yml +++ b/.github/workflows/test-multilingual.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Ruby uses: ruby/setup-ruby@v1 @@ -21,7 +21,7 @@ jobs: bundler-cache: true - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: '20.18.0' cache: 'npm' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0850a5014..71cd09c2e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Ruby uses: ruby/setup-ruby@v1 @@ -19,7 +19,7 @@ jobs: bundler-cache: true - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version-file: '.nvmrc' cache: 'npm' diff --git a/.github/workflows/update-events.yml b/.github/workflows/update-events.yml index 56d737447..f7bb9288a 100644 --- a/.github/workflows/update-events.yml +++ b/.github/workflows/update-events.yml @@ -20,12 +20,12 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: '20' cache: 'npm' diff --git a/.gitignore b/.gitignore index ccadf198c..b4050d14b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,8 @@ app/assets/scripts/config/local.js app/_data/events app/_posts app/.jekyll-cache +app/.jekyll-metadata +app/assets/data/events.json #Foundation additions diff --git a/Gemfile b/Gemfile index f4a0c4d02..97d10ee38 100644 --- a/Gemfile +++ b/Gemfile @@ -10,6 +10,7 @@ gem "jekyll", "~> 4.3.4" gem "jekyll-feed", "~> 0.17" gem "jekyll-sitemap", "~> 1.4" gem "jekyll-polyglot", "~> 1.8" +gem "jekyll-paginate-v2", "~> 3.0" # Additional gems for security and performance gem "webrick", "~> 1.8" # Required for Ruby 3.0+ diff --git a/Gemfile.lock b/Gemfile.lock index 66dbd2193..089325043 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,6 +46,8 @@ GEM webrick (~> 1.7) jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) + jekyll-paginate-v2 (3.0.0) + jekyll (>= 3.0, < 5.0) jekyll-polyglot (1.11.0) jekyll (>= 4.0, >= 3.0) jekyll-sass-converter (3.1.0) @@ -98,6 +100,7 @@ DEPENDENCIES csv (~> 3.3) jekyll (~> 4.3.4) jekyll-feed (~> 0.17) + jekyll-paginate-v2 (~> 3.0) jekyll-polyglot (~> 1.8) jekyll-sitemap (~> 1.4) logger (~> 1.6) diff --git a/_config.yml b/_config.yml index b5ec0809e..ab8691066 100644 --- a/_config.yml +++ b/_config.yml @@ -50,3 +50,14 @@ plugins: - jekyll-feed - jekyll-sitemap - jekyll-polyglot + - jekyll-paginate-v2 + +# Pagination configuration +pagination: + enabled: true + per_page: 15 + permalink: '/blog/page/:num/' + title: ':title - page :num of :max' + limit: 0 + sort_field: 'date' + sort_reverse: true diff --git a/app/.jekyll-metadata b/app/.jekyll-metadata deleted file mode 100644 index ea40476d2..000000000 Binary files a/app/.jekyll-metadata and /dev/null differ diff --git a/app/404.html b/app/404.html index 0c1c0c420..706d75fd6 100644 --- a/app/404.html +++ b/app/404.html @@ -4,6 +4,6 @@ id: 404 lang: en --- -{% include get_locale.html %} +{% assign locale = site.active_lang %} {% include header.html %} {% include 404.html %} diff --git a/app/_data/cs.yml b/app/_data/cs.yml index d63bfe1ae..be93ee821 100644 --- a/app/_data/cs.yml +++ b/app/_data/cs.yml @@ -468,14 +468,19 @@ checker: title: "MapRoulette" text: "MapRoulette is a gamified approach to fixing OSM bugs that breaks common OpenStreetMap data problems into micro tasks. This tool is best used after your event." -################### ## Blog CONTENT ## ################### blog: title: "Blog" tags: "Štítky Blogu" categories: "Kategorie" - nocontent: "Dosud nebyl publikován žádný blog v angličtině." + nocontent: "Dosud nebyl publikován žádný blog v angličtině." + also_available: "Také dostupné v" + pagination_label: "Stránkování blogu" + previous_page: "Předchozí" + next_page: "Další" + page_info: "Stránka" + of: "z" ##################### ## OSM STATS ## @@ -490,3 +495,21 @@ lost: title: "Stránka nenalezena." message: "To je nepříjemné. Zdá se, že jste někde, kde jsme to ještě nezmapovali." link: "Pomozte nám zmapovat svět." + +##################### +## DATE LOCALIZATION ## +##################### +months: + - null + - Leden + - Únor + - Březen + - Duben + - Květen + - Červen + - Červenec + - Srpen + - Září + - Říjen + - Listopad + - Prosinec diff --git a/app/_data/en.yml b/app/_data/en.yml index 7fe9d5e8b..8e7608061 100644 --- a/app/_data/en.yml +++ b/app/_data/en.yml @@ -470,6 +470,12 @@ blog: tags: "Blog Tags" categories: "Blog Categories" nocontent: "No blogs currently published in english." + also_available: "Also available in" + pagination_label: "Blog pagination" + previous_page: "Previous" + next_page: "Next" + page_info: "Page" + of: "of" ##################### ## OSM STATS ## @@ -484,3 +490,21 @@ lost: title: "This page is missing." message: "This is kind of embarrassing. You seem to be somewhere that we haven't mapped yet." link: "Help us map the world." + +##################### +## DATE LOCALIZATION ## +##################### +months: + - null + - January + - February + - March + - April + - May + - June + - July + - August + - September + - October + - November + - December diff --git a/app/_data/es.yml b/app/_data/es.yml index e177f667d..c2c54ef2e 100644 --- a/app/_data/es.yml +++ b/app/_data/es.yml @@ -466,6 +466,12 @@ blog: tags: "Blog Tags" categories: "Blog Categorías" nocontent: "No hay blogs en español publicado actualmente." + also_available: "También disponible en" + pagination_label: "Paginación del blog" + previous_page: "Anterior" + next_page: "Siguiente" + page_info: "Página" + of: "de" ##################### ## OSM STATS ## @@ -480,3 +486,21 @@ lost: title: "Esta página no se encuentra." message: "Esto es un poco embarazoso. Usted parece estar en un lugar que no hemos asignado todavía." link: "Nos ayudan a trazar mapas del mundo." + +##################### +## DATE LOCALIZATION ## +##################### +months: + - null + - Enero + - Febrero + - Marzo + - Abril + - Mayo + - Junio + - Julio + - Agosto + - Septiembre + - Octubre + - Noviembre + - Diciembre diff --git a/app/_data/fr.yml b/app/_data/fr.yml index 9f412195d..1661e5561 100644 --- a/app/_data/fr.yml +++ b/app/_data/fr.yml @@ -55,13 +55,13 @@ nav: - text: "APPRENDRE" links: - text: "DÉBUTANT EN CARTOGRAPHIE" - url: "/fr/débutant/" + url: "/fr/debutant/" - text: "CARTOGRAPHIE AVANCÉE" - url: "/fr/avancé/" + url: "/fr/avance/" - text: "CARTOGRAPHIE DE TERRAIN" url: "/fr/terrain/" - text: "VALIDATION" - url: "/fr/validé/" + url: "/fr/validation/" - text: "MAPSWIPE" url: "/fr/mapswipe/" - text: "ÉVÉNEMENTS" @@ -466,6 +466,17 @@ blog: tags: "Blog Tags" categories: "Blog Catégories" nocontent: "Il n'y a pas des blogs de langue espagnole actuellement publiés." + also_available: "Aussi disponible en" + pagination_label: "Pagination du blog" + previous_page: "Précédent" + next_page: "Suivant" + page_info: "Page" + of: "de" + pagination_label: "Pagination du blog" + previous_page: "Précédent" + next_page: "Suivant" + page_info: "Page" + of: "de" ##################### ## COUNTRY STATS ## @@ -480,3 +491,21 @@ lost: title: "Cette page est manquante." message: "Esto es un poco embarazoso. Usted parece estar en un lugar que no hemos asignado todavía." link: "Aidez-nous à cartographier le monde." + +##################### +## DATE LOCALIZATION ## +##################### +months: + - null + - Janvier + - Février + - Mars + - Avril + - Mai + - Juin + - Juillet + - Août + - Septembre + - Octobre + - Novembre + - Décembre diff --git a/app/_includes/blog.html b/app/_includes/blog.html index e637d1de1..e674448f8 100644 --- a/app/_includes/blog.html +++ b/app/_includes/blog.html @@ -5,23 +5,103 @@
{{post.date | localize: "%d",locale }} {{ post.date | localize: "%B",locale }} {{ post.date | localize: "%Y",locale }} | by {{ post.author }}
-{{ post.excerpt }}
-