From 55e5f65cbd9fd17e4512028cd26da0f9c785f354 Mon Sep 17 00:00:00 2001 From: PrivateBin Translator Bot <72346835+privatebin-translator@users.noreply.github.com> Date: Tue, 8 Oct 2024 23:30:43 +0200 Subject: [PATCH 1/5] New translations en.json (Polish) --- i18n/pl.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/i18n/pl.json b/i18n/pl.json index 51f38eed..78d3e030 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -167,7 +167,7 @@ "Format": "Format", "Plain Text": "Czysty tekst", "Source Code": "Kod źródłowy", - "Markdown": "Markdown", + "Markdown": "Znakowanie", "Download attachment": "Pobierz załącznik", "Cloned: '%s'": "Sklonowano: '%s'", "The cloned file '%s' was attached to this paste.": "Sklonowany plik '%s' był dołączony do tej wklejki.", @@ -181,7 +181,7 @@ "Shorten URL": "Skróć adres URL", "Editor": "Edytować", "Preview": "Podgląd", - "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.", + "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s wymaga zmiennej PATH zakończonej w \"%s\". Zaktualizuj zmienną PATH w index.php.", "Decrypt": "Odszyfruj", "Enter password": "Wpisz hasło", "Loading…": "Wczytywanie…", @@ -191,22 +191,22 @@ "+++ no paste text +++": "+++ brak wklejonego tekstu +++", "Could not get paste data: %s": "Nie można było pobrać danych wklejki: %s", "QR code": "Kod QR", - "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.", - "For more information see this FAQ entry.": "For more information see this FAQ entry.", - "Your browser may require an HTTPS connection to support the WebCrypto API. Try switching to HTTPS.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try switching to HTTPS.", - "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.", - "waiting on user to provide a password": "waiting on user to provide a password", - "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.", - "Retry": "Retry", - "Showing raw text…": "Showing raw text…", - "Notice:": "Notice:", - "This link will expire after %s.": "This link will expire after %s.", - "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.", - "Link:": "Link:", - "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?", - "Use Current Timezone": "Use Current Timezone", - "Convert To UTC": "Convert To UTC", - "Close": "Close", + "This website is using an insecure HTTP connection! Please use it only for testing.": "Ta witryna używa niezabezpieczonego połączenia HTTP! Używaj jej wyłącznie do testowania.", + "For more information see this FAQ entry.": "Aby uzyskać więcej informacji, sprawdź to często zadawane pytanie.", + "Your browser may require an HTTPS connection to support the WebCrypto API. Try switching to HTTPS.": "Twoja przeglądarka może wymagać połączenia HTTPS do obsługi API WebCrypto. Wypróbuj przełączenie na HTTPS.", + "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Twoja przeglądarka nie obsługuje WebAssembly używanego do kompresji zlib. Możesz utworzyć nieskompresowane dokumenty, ale nie możesz odczytać skompresowanych.", + "waiting on user to provide a password": "oczekiwanie na podanie hasła przez użytkownika", + "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Błąd odszyfrowywania danych. Czy wprowadzono niepoprawne hasło? Spróbuj ponownie, używając przycisku na górze.", + "Retry": "Ponów", + "Showing raw text…": "Pokazywanie nieprzetworzonego tekstu…", + "Notice:": "Uwaga:", + "This link will expire after %s.": "Ten odnośnik wygaśnie po %s.", + "This link can only be accessed once, do not use back or refresh button in your browser.": "Tego odnośnika można użyć tylko jeden raz. Nie cofaj ani nie odświeżaj strony w przeglądarce.", + "Link:": "Odnośnik:", + "Recipient may become aware of your timezone, convert time to UTC?": "Odbiorca może uzyskać informację o twojej strefie czasowej. Zamienić czas na UTC?", + "Use Current Timezone": "Użyj bieżącej strefy czasowej", + "Convert To UTC": "Zamień na UTC", + "Close": "Zamknij", "Encrypted note on %s": "Encrypted note on %s", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", From 004053105757ecc88c3812a3d647a3d43ff1a9a0 Mon Sep 17 00:00:00 2001 From: El RIDO Date: Wed, 9 Oct 2024 07:04:12 +0200 Subject: [PATCH 2/5] fix Czech translation tests, test strings now use a non-breaking space --- tst/I18nTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tst/I18nTest.php b/tst/I18nTest.php index 14292400..af0acfb0 100644 --- a/tst/I18nTest.php +++ b/tst/I18nTest.php @@ -154,10 +154,10 @@ class I18nTest extends TestCase $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'cs;q=0.8,en-GB;q=0.6,en-US;q=0.4,en;q=0.2'; I18n::loadTranslations(); $this->assertEquals('cs', I18n::getLanguage(), 'browser language cs'); - $this->assertEquals('1 hodina', I18n::_('%d hours', 1), '1 hour in Czech'); - $this->assertEquals('2 hodiny', I18n::_('%d hours', 2), '2 hours in Czech'); - $this->assertEquals('5 minut', I18n::_('%d minutes', 5), '5 minutes in Czech'); - $this->assertEquals('14 minut', I18n::_('%d minutes', 14), '14 minutes in Czech'); + $this->assertEquals('1 hodina', I18n::_('%d hours', 1), '1 hour in Czech'); + $this->assertEquals('2 hodiny', I18n::_('%d hours', 2), '2 hours in Czech'); + $this->assertEquals('5 minut', I18n::_('%d minutes', 5), '5 minutes in Czech'); + $this->assertEquals('14 minut', I18n::_('%d minutes', 14), '14 minutes in Czech'); } public function testBrowserLanguageAnyDetection() From a8331d65dfa567e22db04d740388c651dd3143a0 Mon Sep 17 00:00:00 2001 From: ensag-dev <59049879+ensag-dev@users.noreply.github.com> Date: Thu, 10 Oct 2024 09:31:08 +0200 Subject: [PATCH 3/5] Update Occitan locale --- i18n/oc.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/i18n/oc.json b/i18n/oc.json index 3799d86c..6708fdad 100644 --- a/i18n/oc.json +++ b/i18n/oc.json @@ -215,9 +215,9 @@ "Trying to shorten a URL that isn't pointing at our instance.": "Ensag d’abracar una URL que mena pas a nòstra instància.", "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error en cridant YOURLS. Es probablament un problèma de configuracion, quicòm coma « apirul » o « signature » marrit o absent.", "Error parsing YOURLS response.": "Error d'analisi de la responsa YOURLS.", - "This secret message can only be displayed once. Would you like to see it now?": "This secret message can only be displayed once. Would you like to see it now?", - "Yes, see it": "Yes, see it", - "Dark Mode": "Dark Mode", - "Error compressing paste, due to missing WebAssembly support.": "Error compressing paste, due to missing WebAssembly support.", - "Error decompressing paste, your browser does not support WebAssembly. Please use another browser to view this paste.": "Error decompressing paste, your browser does not support WebAssembly. Please use another browser to view this paste." + "This secret message can only be displayed once. Would you like to see it now?": "Aqueste messatge secrèt se pòt pas qu'afichar un còp. Lo volètz veire ara ?", + "Yes, see it": "Òc, afichatz-lo", + "Dark Mode": "Mòde escur", + "Error compressing paste, due to missing WebAssembly support.": "Error al moment de la compression de l'empegatge, a causa de la manca de presa en carga de WebAssembly.", + "Error decompressing paste, your browser does not support WebAssembly. Please use another browser to view this paste.": "Error al moment de descompresar l'empegatge, vòstre navegador pren pas en carga WebAssembly. Mercés d'utilizar un autre navigador per visualizar aquesta pega." } From a36d72e9149da1b271ba956cc2be081776a210d8 Mon Sep 17 00:00:00 2001 From: El RIDO Date: Fri, 11 Oct 2024 07:13:20 +0200 Subject: [PATCH 4/5] handle potential key cast since we introduced strict types, this test occasionally fails when a ID consisting only of decimal numbers gets generated --- tst/Data/FilesystemTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tst/Data/FilesystemTest.php b/tst/Data/FilesystemTest.php index 76dec363..390cb66d 100644 --- a/tst/Data/FilesystemTest.php +++ b/tst/Data/FilesystemTest.php @@ -162,6 +162,7 @@ class FilesystemTest extends TestCase // check that all 10 pastes were converted after the purge $this->_model->purge(10); foreach ($ids as $dataid => $storagedir) { + $dataid = (string) $dataid; // undue potential key cast, see https://www.php.net/manual/en/language.types.array.php $this->assertFileExists($storagedir . $dataid . '.php', "paste $dataid exists in new format"); $this->assertFileDoesNotExist($storagedir . $dataid, "old format paste $dataid got removed"); $this->assertTrue($this->_model->exists($dataid), "paste $dataid exists"); From aafc143a5ac5a9c3c9174d249e6dde6c6a733c14 Mon Sep 17 00:00:00 2001 From: El RIDO Date: Fri, 11 Oct 2024 07:14:18 +0200 Subject: [PATCH 5/5] strict types in templates --- tpl/bootstrap.php | 2 +- tpl/bootstrap5.php | 2 +- tpl/page.php | 2 +- tpl/yourlsproxy.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index 901bced7..3cc2331c 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -1,4 +1,4 @@ - > diff --git a/tpl/page.php b/tpl/page.php index 299e877b..ffe0a2cd 100644 --- a/tpl/page.php +++ b/tpl/page.php @@ -1,4 +1,4 @@ - > diff --git a/tpl/yourlsproxy.php b/tpl/yourlsproxy.php index fc56ba82..bb63d6ce 100644 --- a/tpl/yourlsproxy.php +++ b/tpl/yourlsproxy.php @@ -1,4 +1,4 @@ - >