gnucash-htdocs beta: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Tue Mar 28 18:18:48 EDT 2023
Updated via https://github.com/Gnucash/gnucash-htdocs/commit/bc83b225 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/9dae2198 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/c6a77697 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/71120591 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/242fb296 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/cc4aa1a8 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/10bd6309 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/a057215a (commit)
from https://github.com/Gnucash/gnucash-htdocs/commit/447252ac (commit)
commit bc83b22506b658a0736c93d08b6b5a68e7f0dfc5
Merge: 447252a 9dae219
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 28 15:18:33 2023 -0700
Merge branch 'master' into beta
commit 9dae21988118efd76f2f680aa0f6375ec5bc4194
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 27 14:35:10 2023 -0700
Reverse refactor of locale detection.
diff --git a/lang.php b/lang.php
index 2495ba2..8d4896d 100644
--- a/lang.php
+++ b/lang.php
@@ -42,55 +42,50 @@ if (array_key_exists('lang_cookie', $_COOKIE)) {
}
# allow user override.
-$languages = filter_input(INPUT_GET, 'lang', FILTER_SANITIZE_STRING);
+$get_lang = filter_input(INPUT_GET, 'lang', FILTER_SANITIZE_STRING);
-# choose a default language based on the client browser's preferred
-# language list
-#echo ("<!-- top_dir: $top_dir, me: ".__FILE__."-->\n");
+if ($get_lang) { $locale = $get_lang; }
-# Find the locale from Client Accept language
-# Get user preferred languages, and match against supported language
-if ($languages == "" and isset( $_SERVER["HTTP_ACCEPT_LANGUAGE"] ) )
-{
- # tolower() => remove space => '-' -> '_'
- $accept_language = filter_input(INPUT_SERVER, 'HTTP_ACCEPT_LANGUAGE', FILTER_SANITIZE_STRING);
- $languages = str_replace('-','_', str_replace(' ', '', strtolower($accept_language)));
-}
-
-$ranked_langs = [];
-$languages = explode(",", $languages);
-if (count($languages) > 1) {
- foreach ($languages as $item)
+# Find the full locale name for short language name.
+if (strlen($locale) == 2) {
+ foreach($supported_languages as $loc_lang => $loc_dir)
{
- $parts = explode(";", $item);
- if ($parts) {
- if (!$parts[1]) {
- $ranked_langs[$parts[0]] = 1.0;
- } else {
- $ranked_langs[$parts[0]] = (float)substr($parts[1], 2);
- }
+ if ( (strtolower($locale) == strtolower($loc_dir))
+ || (strtolower($locale) == substr($loc_lang, 0, 2 )) )
+ {
+ $locale = $loc_lang;
+ break;
}
}
- arsort($ranked_langs, SORT_NUMERIC);
-} else if ($languages[0] != "") {
- $ranked_langs[$languages[0]] = 1.0;
}
-foreach (array_keys($ranked_langs) as $lang) {
- if ($ranked_langs[$lang] == 0) {
- break;
- }
- $lang_short = substr($lang, 0, 2);
- # full match is prefer, but short match is acceptable.
- foreach ($supported_languages as $loc_lang => $loc_dir)
+# Find the locale from Client Accept language
+if ($locale == "") {
+ # Get user preferred languages, and match against supported language
+ if ( isset( $_SERVER["HTTP_ACCEPT_LANGUAGE"] ) )
{
- if ($lang == strtolower($loc_lang)) { $locale = $loc_lang; break; }
- if ($lang_short == substr($loc_lang, 0, 2 )) { $locale = $loc_lang; }
+ # tolower() => remove space => '-' -> '_'
+ # "fr-ch;q=0.3, en, zh-cn;q=0.7" => "fr_ch;q=0.3,en,zh_cn;q=0.7"
+ $accept_language = filter_input(INPUT_SERVER, 'HTTP_ACCEPT_LANGUAGE', FILTER_SANITZE_STRING);
+ $languages = str_replace('-','_', str_replace(' ', '', strtolower($accept_language)));
+ $languages = explode(",", $languages);
+ foreach ($languages as $item)
+ {
+ # "zh_cn;q=0.7" => "zh_cn"
+ $lang = substr($item, 0, strcspn($item, ';'));
+ $lang_short = substr($lang, 0, 2);
+ # full match is prefer, but short match is acceptable.
+ foreach ($supported_languages as $loc_lang => $loc_dir)
+ {
+ if ($lang == strtolower($loc_lang)) { $locale = $loc_lang; break; }
+ if ($lang_short == substr($loc_lang, 0, 2 )) { $locale = $loc_lang; }
+ }
+ if ($locale != "") { break; }
+ }
}
- if ($locale != "") { break; }
+ # nothing matched, use default language
+ if ($locale == "") { $locale = "en_US"; }
}
-# nothing matched, use default language
-if ($locale == "") { $locale = "en_US"; }
$lang_dir = array_key_exists($locale, $supported_languages) ?
$supported_languages[$locale] : "en";
commit c6a77697d0b0582c35fc83bda3edd6c8df499074
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 27 10:35:46 2023 -0700
Fix macOS dmg filename in 5.0 release notes.
diff --git a/news/230326-5.0.news b/news/230326-5.0.news
index 14a2da5..447d71a 100644
--- a/news/230326-5.0.news
+++ b/news/230326-5.0.news
@@ -103,7 +103,7 @@
<li><code>cfc13bab31aed8e4962805ef56530f9772889604910b5678cb5c79c283138824</code> gnucash-5.0.tar.bz2</li>
<li><code>66dd5e32829cb6d8dd9a7e017a894583c7579932d13c4fe024329d9c6cfe956d</code> gnucash-5.0.tar.gz</li>
<li><code>e9d30e36163a7f047daf2523ac35bf2218d2e661bcfc7f279d57d4d396caa33d</code> gnucash-5.0.setup.exe</li>
- <li><code>c8ea60b2ccbeab5f6997a927939a0fad715fbbe494644e586c6c386bfec6857a</code> Gnucash-Intel-5.0-2.dmg</li>
+ <li><code>c8ea60b2ccbeab5f6997a927939a0fad715fbbe494644e586c6c386bfec6857a</code> Gnucash-Intel-5.0-1.dmg</li>
<li><code>02a1d6d0d8c61aae47b1200af482967ed16322a41f31dd8cf3a6679e7159edb1</code> gnucash-docs-5.0.tar.gz</li>
</ul>
commit 71120591188c362b6f9154bdb746a44ea22a2066
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 26 16:35:56 2023 -0700
Compile the latest translations.
diff --git a/locale/de/LC_MESSAGES/gnucash-htdocs.mo b/locale/de/LC_MESSAGES/gnucash-htdocs.mo
index 9946432..7e793ff 100644
Binary files a/locale/de/LC_MESSAGES/gnucash-htdocs.mo and b/locale/de/LC_MESSAGES/gnucash-htdocs.mo differ
diff --git a/locale/hr/LC_MESSAGES/gnucash-htdocs.mo b/locale/hr/LC_MESSAGES/gnucash-htdocs.mo
index da51ab9..eb86b99 100644
Binary files a/locale/hr/LC_MESSAGES/gnucash-htdocs.mo and b/locale/hr/LC_MESSAGES/gnucash-htdocs.mo differ
diff --git a/locale/pt/LC_MESSAGES/gnucash-htdocs.mo b/locale/pt/LC_MESSAGES/gnucash-htdocs.mo
index 7e6ca83..215cafb 100644
Binary files a/locale/pt/LC_MESSAGES/gnucash-htdocs.mo and b/locale/pt/LC_MESSAGES/gnucash-htdocs.mo differ
commit 242fb2963ffb4e589becbcc911bb44c66b2226a9
Merge: 3f15f0c cc4aa1a
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 26 16:32:07 2023 -0700
Merge latest translations from Weblate.
commit cc4aa1a86f667205e4fe21629a6511aa4a7cb5a6
Author: Pedro Albuquerque <pmra at gmx.com>
Date: Sun Mar 26 09:00:25 2023 +0200
Translation update by Pedro Albuquerque <pmra at gmx.com> using Weblate
po/pt.po: 100.0% (403 of 403 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Website (Portuguese)
Translate-URL: https://hosted.weblate.org/projects/gnucash/website/pt/
Translation update by Pedro Albuquerque <pmra at gmx.com> using Weblate
po/pt.po: 100.0% (403 of 403 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Website (Portuguese)
Translate-URL: https://hosted.weblate.org/projects/gnucash/website/pt/
Co-authored-by: Pedro Albuquerque <pmra at gmx.com>
diff --git a/po/pt.po b/po/pt.po
index 2f9c255..bd8f0eb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,7 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/buglist."
"cgi?component=Translations&product=Website&resolution=---\n"
"POT-Creation-Date: 2022-10-27 19:35+0200\n"
-"PO-Revision-Date: 2023-02-08 08:37+0000\n"
+"PO-Revision-Date: 2023-03-26 07:00+0000\n"
"Last-Translator: Pedro Albuquerque <pmra at gmx.com>\n"
"Language-Team: Portuguese <https://hosted.weblate.org/projects/gnucash/"
"website/pt/>\n"
@@ -19,7 +19,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.16-dev\n"
+"X-Generator: Weblate 4.17-dev\n"
#: 2.6-release-tour.phtml:3
msgid "GnuCash 2.6 release tour"
@@ -45,7 +45,7 @@ msgid ""
msgstr ""
"O <span class=\"gnucash\">GnuCash</span> agora usa javascript jqplot para "
"desenhar relatórios. Confere um aspecto mais profissional a todos os "
-"relatórios gráficos (circulares, de barras, pontos)."
+"relatórios gráficos (circulares, de barras, dispersão)."
#: 2.6-release-tour.phtml:26
msgid "A barchart rendered in GnuCash with jqplot."
@@ -101,7 +101,7 @@ msgstr ""
"É agora possÃvel ligar um ficheiro ou localização externa (URL) a uma "
"transacção. Esta funcionalidade há muito desejada está disponÃvel através do "
"menu Transacção e do menu contextual da transacção. Os ficheiros são "
-"mostrados no visualizador predefinido para esse tipo de ficheiro."
+"mostrados no visualizador pré-definido para esse tipo de ficheiro."
#: 2.6-release-tour.phtml:60
msgid ""
@@ -202,13 +202,13 @@ msgstr ""
#: 2.6-release-tour.phtml:118
msgid "Improved business module"
-msgstr "Módulo de negócios melhorado"
+msgstr "Módulo de empresas melhorado"
#: 2.6-release-tour.phtml:120
msgid ""
"The business module has been revamped and we introduced some new features:"
msgstr ""
-"O módulo de negócios foi revisto e introduzimos algumas novas "
+"O módulo de empresas foi revisto e introduzimos algumas novas "
"funcionalidades:"
#: 2.6-release-tour.phtml:122
@@ -226,7 +226,7 @@ msgstr "Relatórios resumo de clientes"
#: 2.6-release-tour.phtml:125
msgid "Existing Transactions may be reassigned as invoice payments"
msgstr ""
-"Transacções existentes pode ser re-atribuÃdo como pagamentos de facturas"
+"Transacções existentes podem ser reatribuÃdas como pagamentos de facturas"
#: 2.6-release-tour.phtml:126
msgid "One click duplication of invoices"
@@ -238,7 +238,7 @@ msgid ""
"directly from a search results list"
msgstr ""
"Gestão de facturas e pagamentos melhorada: emita, imprima ou duplique "
-"múltiplos itens directamente a partir de uma lista de resultados de procura"
+"múltiplos itens directamente a partir de uma lista de procura"
#: 2.6-release-tour.phtml:128
msgid ""
@@ -290,9 +290,9 @@ msgid ""
"them."
msgstr ""
"Note que a posição da janela, tamanhos de colunas e ordenação não serão "
-"migradas do GConf. Essas definições revertem para a predefinição na primeira "
-"utilização do GnuCash 2.6 ou posterior, mas serão gravadas uma vez que as "
-"reponha."
+"migradas do GConf. Essas definições revertem para a pré-definição na "
+"primeira utilização do GnuCash 2.6 ou posterior, mas serão gravadas uma vez "
+"que as reponha."
#: 2.6-release-tour.phtml:159
msgid "Relicensing"
@@ -1217,10 +1217,10 @@ msgid ""
"Linux machines. If you have <a href=\"%s\">Flatpak</a> installed, you can "
"download any recent version of <span class=\"gnucash\">GnuCash</span> from"
msgstr ""
-"Uma alternativa para usar o gestor de software da sua distribuição é usar o "
-"sistema de gestão Flatpak, que agrupa todas as bibliotecas necessárias para "
-"si. Isso pode facilitar a instalação de versões mais recentes do GnuCash em "
-"sistemas de Linux mais antigas. Se tiver <a href=\"%s\">Flatpak</a> "
+"Uma alternativa para usar o gestor de programas da sua distribuição é usar o "
+"sistema Flatpak, que agrupa todas as bibliotecas necessárias ao programa. "
+"Isto pode facilitar a instalação de versões mais recentes do GnuCash em "
+"sistemas Linux mais antigos. Se tiver o <a href=\"%s\">Flatpak</a> "
"instalado, pode transferir qualquer versão recente do <span class=\"gnucash\""
">GnuCash</span> de"
@@ -1291,8 +1291,8 @@ msgid ""
"This old stable release is the final version of all bugfixes from the "
"previous stable series without being a major upgrade."
msgstr ""
-"Esta versão estável antiga é a versão final de todas as correções de bugs da "
-"série estável anterior sem ser uma grande atualização."
+"Esta versão estável antiga é a versão final de todas as correcções de erros "
+"da série estável anterior sem ser uma actualização principal."
#: download.phtml:84
#, php-format
@@ -1331,7 +1331,7 @@ msgstr "Ver todas as transferências do GnuCash"
#: externals/footer.phtml:12
msgid "Server & email outage reports to:"
-msgstr "Relatórios de baixa do servidor e correio electrónico para:"
+msgstr "Relate baixas do servidor e correio electrónico em:"
#: externals/footer.phtml:14
msgid "Translation problems? Contact:"
@@ -1339,7 +1339,7 @@ msgstr "Problemas de tradução? Contacto:"
#: externals/global_params.php:90 externals/header.phtml:144
msgid "Free Accounting Software"
-msgstr "Programa de contabilidade livre"
+msgstr "Programa livre de contabilidade"
#: externals/global_params.php:91
msgid ""
@@ -1971,7 +1971,7 @@ msgstr ""
#: index.phtml:10
msgid "Welcome to GnuCash.org"
-msgstr "Boas vindas a GnuCash.org"
+msgstr "Boas-vindas a GnuCash.org"
#: index.phtml:14
#, php-format
@@ -1998,7 +1998,7 @@ msgid ""
"earlier, and so the last version that will run on PowerPC Macs."
msgstr ""
"A versão %s é a última para Windows XP/Vista e MacOS X 10.8 e anteriores e "
-"também a última que executa em PowerPC Macs."
+"também a última que funciona em PowerPC Macs."
#: index.phtml:44
msgid ""
@@ -2070,7 +2070,7 @@ msgstr "Contas de acções/tÃtulos/fundos mutualistas"
#: index.phtml:73
msgid "Small-Business Accounting"
-msgstr "Contabilidade de pequenos negócios"
+msgstr "Contabilidade de micro-empresas"
#: index.phtml:75
msgid "QIF/OFX/HBCI Import, Transaction Matching"
commit 10bd630912d0de04a1d9560a93f7fe4d8d6d29b1
Author: Milo Ivir <mail at milotype.de>
Date: Sun Mar 26 09:00:24 2023 +0200
Translation update by Milo Ivir <mail at milotype.de> using Weblate
po/hr.po: 100.0% (403 of 403 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Website (Croatian)
Translate-URL: https://hosted.weblate.org/projects/gnucash/website/hr/
Translation update by Milo Ivir <mail at milotype.de> using Weblate
po/hr.po: 100.0% (403 of 403 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Website (Croatian)
Translate-URL: https://hosted.weblate.org/projects/gnucash/website/hr/
Co-authored-by: Milo Ivir <mail at milotype.de>
diff --git a/po/hr.po b/po/hr.po
index b9a5a81..f942403 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -11,7 +11,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/buglist."
"cgi?component=Translations&product=Website&resolution=---\n"
"POT-Creation-Date: 2022-10-27 19:35+0200\n"
-"PO-Revision-Date: 2023-03-14 14:37+0000\n"
+"PO-Revision-Date: 2023-03-25 14:40+0000\n"
"Last-Translator: Milo Ivir <mail at milotype.de>\n"
"Language-Team: Croatian <https://hosted.weblate.org/projects/gnucash/website/"
"hr/>\n"
@@ -21,7 +21,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.16.2-dev\n"
+"X-Generator: Weblate 4.17-dev\n"
#: 2.6-release-tour.phtml:3
msgid "GnuCash 2.6 release tour"
@@ -1207,11 +1207,11 @@ msgid ""
"Linux machines. If you have <a href=\"%s\">Flatpak</a> installed, you can "
"download any recent version of <span class=\"gnucash\">GnuCash</span> from"
msgstr ""
-"Alternativa koriÅ¡tenju upravljaÄa softvera tvoje distribucije je koriÅ¡tenje "
-"sustava upravljanja Flatpak, koji skuplja sve potrebne biblioteke. Ovo može "
-"olakšati instalaciju novijih verzija GnuCasha na starijim Linux uređajima. "
-"Ako imaš instaliran <a href=\"%s\">Flatpak</a>, možeš preuzeti bilo koju "
-"noviju <span class=\"gnucash\">GnuCash</span> verziju s"
+"Alternativa za koriÅ¡tenje upravljaÄa softvera tvoje distribucije je "
+"korištenje Flatpak sustava upravljanja koji sadrži sve potrebne biblioteke. "
+"Ovo može olakšati instalaciju novijih verzija GnuCasha na starijim Linux "
+"uređajima. Ako imaš instaliran <a href=\"%s\">Flatpak</a>, možeš preuzeti "
+"bilo koju noviju <span class=\"gnucash\">GnuCash</span> verziju od"
#. Translators: %s is the base url of the gnucash wiki, adjust this,
#. if a localized instance of the Flatpak page exists like "%sDe/Flatpak"
@@ -1955,7 +1955,7 @@ msgstr "Preuzmi GnuCash %s"
#: index.phtml:18
msgid "Via distribution"
-msgstr "Distribucije"
+msgstr "Putem distribucije"
#: index.phtml:25
msgid "More downloads (Source code, Development …)"
commit a057215ae67764188e96ef2dc0071570178d8747
Author: Christian Stimming <christian at cstimming.de>
Date: Sun Mar 26 09:00:24 2023 +0200
Translation update by Christian Stimming <christian at cstimming.de> using Weblate
po/de.po: 98.0% (395 of 403 strings; 6 fuzzy)
18 failing checks (4.4%)
Translation: GnuCash/Website (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/website/de/
Co-authored-by: Christian Stimming <christian at cstimming.de>
diff --git a/po/de.po b/po/de.po
index 281f888..376df61 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,14 +12,15 @@
# Marco Zietzling <marco.zietzling at gmail.com>, 2020, 2021.
# Thomas Kriegel <warrel040 at gmx.de>, 2021.
# Jan Schneider <grimpeur78 at gmail.com>, 2022.
+# Christian Stimming <christian at cstimming.de>, 2023.
msgid ""
msgstr ""
"Project-Id-Version: de\n"
-"Report-Msgid-Bugs-To: https://bugs.gnucash.org/buglist.cgi?"
-"component=Translations&product=Website&resolution=---\n"
+"Report-Msgid-Bugs-To: https://bugs.gnucash.org/buglist."
+"cgi?component=Translations&product=Website&resolution=---\n"
"POT-Creation-Date: 2022-10-27 19:35+0200\n"
-"PO-Revision-Date: 2022-09-28 19:16+0000\n"
-"Last-Translator: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>\n"
+"PO-Revision-Date: 2023-03-20 21:25+0000\n"
+"Last-Translator: Christian Stimming <christian at cstimming.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/website/"
"de/>\n"
"Language: de\n"
@@ -27,7 +28,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.14.1\n"
+"X-Generator: Weblate 4.16.2-dev\n"
#: 2.6-release-tour.phtml:3
msgid "GnuCash 2.6 release tour"
@@ -1365,7 +1366,7 @@ msgstr ""
#: download.phtml:112
msgid "Other"
-msgstr "Andere Auswahlmöglichkeiten"
+msgstr "Weitere"
#: download.phtml:116
#, php-format
Summary of changes:
lang.php | 73 +++++++++++++++-----------------
locale/de/LC_MESSAGES/gnucash-htdocs.mo | Bin 93715 -> 93689 bytes
locale/hr/LC_MESSAGES/gnucash-htdocs.mo | Bin 91726 -> 91733 bytes
locale/pt/LC_MESSAGES/gnucash-htdocs.mo | Bin 94219 -> 94199 bytes
news/230326-5.0.news | 2 +-
po/de.po | 13 +++---
po/hr.po | 16 +++----
po/pt.po | 44 +++++++++----------
8 files changed, 72 insertions(+), 76 deletions(-)
More information about the gnucash-changes
mailing list