From 9210ac470c18b840a6788607333eea6de63c8891 Mon Sep 17 00:00:00 2001 From: Gaurav Gaur Date: Mon, 16 Jan 2023 10:46:49 +0000 Subject: [PATCH] parent 7a3a0a1b114ccea4b84b4204f8f2b393f6d7a8d1 author Gaurav Gaur 1673866009 +0000 committer Gaurav Gaur 1674946094 +0000 Jan23 upstream merge (#7) * chore(editorconfig): keep trailing spaces in Markdown (#830) * feat(i18n): add Czech language (#833) * fix: correct encoding of spaces in share URLs (#835) Resolves #835 * fix: post's image would cover the PWA update alert * feat(i18n): add Finnish translations (#843) * docs: update tutorials - remove outdated content - append instructions for SASS overrides (#827) * chore(deps): lock `jekyll-sass-converter` to `v2.x` on Linux-musl (#829) Also, make the division formula backward compatible with `jekyll-sass-converter 2.x` (#848, #849) Ref: https://github.com/jekyll/jekyll-sass-converter#migrate-from-2x-to-3x * chore(bundler): deprecate `:install_if` option in Gemfile * feat(i18n): add Italian translation (#850) * fix: copy command line incomplete(`.gp` part) Co-authored-by: Jarda Beran Co-authored-by: MatyIRG <100308274+MatyIRG@users.noreply.github.com> Co-authored-by: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Co-authored-by: Kalle Lahtinen <39586081+Kaaponen@users.noreply.github.com> Co-authored-by: Eduardo <85281180+CsaProtocol@users.noreply.github.com> feat(i18n): add Czech language (#833) fix: correct encoding of spaces in share URLs (#835) Resolves #835 fix: post's image would cover the PWA update alert feat(i18n): add Finnish translations (#843) chore(bundler): deprecate `:install_if` option in Gemfile feat(i18n): add Italian translation (#850) --- .editorconfig | 4 +- Gemfile | 15 ++++-- _data/locales/cs-CZ.yml | 91 ++++++++++++++++++++++++++++++++++++ _data/locales/fi-FI.yml | 92 ++++++++++++++++++++++++++++++++++++ _data/locales/it-IT.yml | 93 +++++++++++++++++++++++++++++++++++++ _includes/post-sharing.html | 1 + _sass/addon/syntax.scss | 14 +++--- 7 files changed, 299 insertions(+), 11 deletions(-) create mode 100644 _data/locales/cs-CZ.yml create mode 100644 _data/locales/fi-FI.yml create mode 100644 _data/locales/it-IT.yml diff --git a/.editorconfig b/.editorconfig index 8dccd848f81..f27e9a90950 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,6 +9,8 @@ trim_trailing_whitespace = true end_of_line = lf insert_final_newline = true - [*.js] indent_size = 4 + +[*.md] +trim_trailing_whitespace = false diff --git a/Gemfile b/Gemfile index 6438466423f..7b5377f169c 100644 --- a/Gemfile +++ b/Gemfile @@ -10,10 +10,19 @@ end # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem # and associated library. -install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do - gem "tzinfo", "~> 1.2" +platforms :mingw, :x64_mingw, :mswin, :jruby do + gem "tzinfo", ">= 1", "< 3" gem "tzinfo-data" end # Performance-booster for watching directories on Windows -gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform? +gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] + +# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem +# do not have a Java counterpart. +gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby] + +# Lock jekyll-sass-converter to 2.x on Linux-musl +if RUBY_PLATFORM =~ /linux-musl/ + gem "jekyll-sass-converter", "~> 2.0" +end diff --git a/_data/locales/cs-CZ.yml b/_data/locales/cs-CZ.yml new file mode 100644 index 00000000000..39b585c45bb --- /dev/null +++ b/_data/locales/cs-CZ.yml @@ -0,0 +1,91 @@ +# The layout text of site + +# ----- Commons label ----- + +layout: + post: Příspěvek + category: Kategorie + tag: Štítek + +# The tabs of sidebar +tabs: + # format: : + home: Domů + categories: Kategorie + tags: Štítky + archives: Archivy + about: O mně + +# the text displayed in the search bar & search results +search: + hint: hledat + cancel: Zrušit + no_results: Ups! Žádný výsledek nenalezen. + +panel: + lastmod: Nedávno aktualizováno + trending_tags: Trendy štítky + toc: Obsah + +copyright: + # Shown at the bottom of the post + license: + template: Tento příspěvek je licencován pod :LICENSE_NAME autorem. + name: CC BY 4.0 + link: https://creativecommons.org/licenses/by/4.0/ + + # Displayed in the footer + brief: Některá práva vyhrazena. + verbose: >- + Pokud není uvedeno jinak, jsou příspěvky na tomto webu licencovány + pod licencí Creative Commons Attribution 4.0 International (CC BY 4.0) Licence autora. + +meta: Použití :PLATFORM s motivem :THEME. + +not_found: + statment: Omlouváme se, adresu URL jsme špatně umístili nebo odkazuje na něco, co neexistuje. + +notification: + update_found: Je k dispozici nová verze obsahu. + update: Aktualizace + +# ----- Posts related labels ----- + +post: + written_by: Od + posted: Zveřejněno + updated: Aktualizováno + words: slova + pageview_measure: zhlednutí + read_time: + unit: minut + prompt: čtení + relate_posts: Další čtení + share: Sdílet + button: + next: Novější + previous: Starší + copy_code: + succeed: Zkopírováno! + share_link: + title: Kopírovat odkaz + succeed: Zkopírováno! + # pinned prompt of posts list on homepage + pin_prompt: Připnuto + +# Date time format. +# See: , +df: + post: + strftime: '%b %e, %Y' + dayjs: 'll' + archives: + strftime: '%b' + dayjs: 'MMM' + +# categories page +categories: + category_measure: kategorie + post_measure: + singular: příspěvěk + plural: příspěvky diff --git a/_data/locales/fi-FI.yml b/_data/locales/fi-FI.yml new file mode 100644 index 00000000000..605969f86ac --- /dev/null +++ b/_data/locales/fi-FI.yml @@ -0,0 +1,92 @@ +# The layout text of site + +# ----- Commons label ----- + +layout: + post: Julkaisu + category: Kateogoria + tag: Tagi + +# The tabs of sidebar +tabs: + # format: : + home: Koti + categories: Kateogoriat + tags: Tagit + archives: Arkistot + about: Minusta + +# the text displayed in the search bar & search results +search: + hint: etsi + cancel: Peruuta + no_results: Hups! Ei tuloksia. + +panel: + lastmod: Viimeksi päivitetty + trending_tags: Trendaavat tagit + toc: Sisältö + +copyright: + # Shown at the bottom of the post + license: + template: Tämä julkaisu on lisenssoitu :LICENSE_NAME julkaisijan toimesta. + name: CC BY 4.0 + link: https://creativecommons.org/licenses/by/4.0/ + + # Displayed in the footer + brief: Jotkut oikeudet pidätetään. + verbose: >- + Paitsi jos erikseen mainitaan on kaikki sisältö Creative Commons Attribution 4.0 International (CC BY 4.0) Lisensoitu kirjoittajan toimesta. + +meta: Käytetään :PLATFORM iä Teema :THEME. + +not_found: + statment: Valitettavasti tällä URL-osoitteella ei ole saatavilla sisältöä. + +notification: + update_found: Uusi versio sisällöstä on saatavilla. + update: Päivitä + +# ----- Posts related labels ----- + +post: + written_by: Kirjoittaja + posted: Julkaistu + updated: Päivitetty + words: sanaa + pageview_measure: katselukertoja + read_time: + unit: minuuttia + prompt: lukea + relate_posts: Jatka lukemista + share: Jaa + button: + next: Uudempi + previous: Vanhempi + copy_code: + succeed: Kopiotu! + share_link: + title: Kopioi linkki + succeed: Linkki kopioitu onnistuneesti! + # pinned prompt of posts list on homepage + pin_prompt: Kiinnitetty + +# Date time format. +# See: , +df: + post: + strftime: '%b %e, %Y' + dayjs: 'll' + archives: + strftime: '%b' + dayjs: 'MMM' + +# categories page +categories: + category_measure: + singular: kategoria + plural: kategoriat + post_measure: + singular: julkaisu + plural: julkaisut diff --git a/_data/locales/it-IT.yml b/_data/locales/it-IT.yml new file mode 100644 index 00000000000..03aa19c50a6 --- /dev/null +++ b/_data/locales/it-IT.yml @@ -0,0 +1,93 @@ +# The layout text of site + +# ----- Commons label ----- + +layout: + post: Post + category: Categoria + tag: Tag + +# The tabs of sidebar +tabs: + # format: : + home: Pagina principale + categories: Categorie + tags: Tags + archives: Archivio + about: Informazioni + +# the text displayed in the search bar & search results +search: + hint: ricerca + cancel: Cancella + no_results: Oops! La ricerca non ha fornito risultati. + +panel: + lastmod: Aggiornati recentemente + trending_tags: Tags più cliccati + toc: Contenuti + +copyright: + # Shown at the bottom of the post + license: + template: Questo post è sotto licenza :LICENSE_NAME a nome dell'autore. + name: CC BY 4.0 + link: https://creativecommons.org/licenses/by/4.0/ + + # Displayed in the footer + brief: Alcuni diritti riservati. + verbose: >- + Eccetto quando esplicitamente menzionato, i post di questo blog sono da ritenersi sotto + i termini di licenza Creative Commons Attribution 4.0 International (CC BY 4.0). + + +meta: Servizio offerto da :PLATFORM con tema :THEME. +not_found: + statment: Ci scusiamo, non è stato possibile trovare l'URL in questione. Potrebbe puntare ad una pagina non esistente. + +notification: + update_found: Nuova versione del contenuto disponibile. + update: Aggiornamento + +# ----- Posts related labels ----- + +post: + written_by: Da + posted: Postato + updated: Aggiornato + words: parole + pageview_measure: visioni + read_time: + unit: min + prompt: lettura + relate_posts: Continua a leggere + share: Condividi + button: + next: Più recenti + previous: Meno recenti + copy_code: + succeed: Copiato! + share_link: + title: Copia link + succeed: Link copiato con successo! + # pinned prompt of posts list on homepage + pin_prompt: In alto + +# Date time format. +# See: , +df: + post: + strftime: '%b %e, %Y' + dayjs: 'll' + archives: + strftime: '%b' + dayjs: 'MMM' + +# categories page +categories: + category_measure: + singular: categoria + plural: categorie + post_measure: + singular: post + plural: posts diff --git a/_includes/post-sharing.html b/_includes/post-sharing.html index 7285c39a6be..c241ea5e34e 100644 --- a/_includes/post-sharing.html +++ b/_includes/post-sharing.html @@ -6,6 +6,7 @@