Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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'
Expand Down Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manual-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Setup Ruby
uses: ruby/setup-ruby@v1
Expand All @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-multilingual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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+
Expand Down
3 changes: 3 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
11 changes: 11 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file removed app/.jekyll-metadata
Binary file not shown.
2 changes: 1 addition & 1 deletion app/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
id: 404
lang: en
---
{% include get_locale.html %}
{% assign locale = site.active_lang %}
{% include header.html %}
{% include 404.html %}
27 changes: 25 additions & 2 deletions app/_data/cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -468,14 +468,19 @@ checker:
title: "MapRoulette"
text: "<a href=\"https://maproulette.org/\">MapRoulette</a> 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 ##
Expand All @@ -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
24 changes: 24 additions & 0 deletions app/_data/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##
Expand All @@ -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
24 changes: 24 additions & 0 deletions app/_data/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##
Expand All @@ -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
35 changes: 32 additions & 3 deletions app/_data/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 ##
Expand All @@ -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
Loading