From add6a4bec7f0f81a462e97c03c355bbda37654e3 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 18 Mar 2022 17:29:35 +0100 Subject: [PATCH 1/5] PL translation update THX strebski --- custom/templates/home.tmpl | 4 ++-- lang/pl-PL/LC_MESSAGES/messages.mo | Bin 2710 -> 3293 bytes lang/pl-PL/LC_MESSAGES/messages.pot | 15 ++++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/custom/templates/home.tmpl b/custom/templates/home.tmpl index 2e16ada..a74d988 100644 --- a/custom/templates/home.tmpl +++ b/custom/templates/home.tmpl @@ -3,7 +3,7 @@
- +

@@ -191,7 +191,7 @@ Interoperacyjność

- Friendica has build in support for the ActivityPub (e.g. Hubzilla, Mastodon, Pleroma, Pixelfed, Socialhome), OStatus (e.g. GNU social) and diaspora* (e.g. diaspora*) protocol. With additional addons you can bridge to more networks like pump.io, Twitter and others. + Friendica ma wbudowaną obsługę protokołów ActivityPub (np. Hubzilla, Mastodon, Pleroma, Pixelfed, Socialhome), Ostatus (np. GNU Social) i diaspora* (np. diaspora*). Dzięki dodatkowym dodatkom możesz połączyć się z większą liczbą sieci, takimi jak pump.io, Twitter i inne.

diff --git a/lang/pl-PL/LC_MESSAGES/messages.mo b/lang/pl-PL/LC_MESSAGES/messages.mo index 05ad2119ab38f8cd85d541a6603a2ec13b6b353a..6a8f30fd30e91ac0d3efe9c5c12d049968d2385d 100644 GIT binary patch delta 812 zcmbV~ziSjh6vyY{1uyg26fm#Tb77A%>1Tomy>D%1-Bdr5pJ~MCLyqWi9o-TeoG5mC_z9D!V zV4Y-X)?wBbs~X=}9&3jcvQ}zB9A&;_9$~$&$m{L7>A4+dgJVCL_nD3QH2>ke5X&6f zU_Rjd&HX~$7UHTn+n5%3%xv+2XUru|c)Kv=HuDt6e=wgjmktVXocG@x5`ve4YwnK5 zlNZbLRTm4JA7F0Smj=8HbpRNH$&!Rp3#*iZ?JKzGTfB>Q(8)YFt=ygqS2C|at)&Ck zq_GrG>_A7Wlp+pw@Sf7EDsZ4nK1$uENHra}(Y4ZMW>(?y^_yUJx0@j2VE_S2!?()T zEaA_(2}w$pe9|u5LfZ!!1Za_BsjDf)1_qRYFJtgh40;MIK}4y7SlOJ?(16BJL6Sv@ zi{!vcj@GJ_uML2>ztp(nuXA5&tqzh+p=;A}|)1iR8I%Nv(NuytQOoPft b2doS+LbxNt%FV^Sb|QbBSh?eOjn}nbS#$PO delta 246 zcmcaBIZd?wo)F7a1|Z-BVi_P#0b*VtUIWA+@BoODfcPO0X9KYdBLjl~klp~K`GNQ# zhz9a6GC}k`1k%+&vG+h4q%NC, 2022 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-08-18 18:15+CEST\n" "PO-Revision-Date: 2018-06-06 12:46+0000\n" -"Last-Translator: Waldemar Stoczkowski, 2018\n" +"Last-Translator: Piotr Strębski , 2022\n" "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -49,16 +50,16 @@ msgid "" "later). The entire source code is hosted at git.friendi.ca. Join " "us by contributing to make this project even better. Don't be shy to be a contributor!" +"href='https://git.friendi.ca/friendica/friendica/src/branch/develop/doc/Developers-" +"Intro.md'>be a contributor!" msgstr "" "Friendica to wolne oprogramowanie, licencjonowane zgodnie z warunkami AGPLv3" " (lub nowszym). Cały kod źródłowy jest hostowany na stronie git.friendi.ca. Dołącz" " do nas, przyczyniając się do tego, aby ten projekt był jeszcze lepszy. Nie " "wstydź się być współtwórcą!" +"href='https://git.friendi.ca/friendica/friendica/src/branch/develop/doc/Developers-" +"Intro.md'>być współtwórcą!" #: generate_home_tmpl.py:44 msgid "Decentralization" @@ -87,3 +88,7 @@ msgid "" "(e.g. diaspora*) protocol. With additional addons you can bridge to more " "networks like pump.io, Twitter and others." msgstr "" +"Friendica ma wbudowaną obsługę protokołów ActivityPub (np. Hubzilla, " +"Mastodon, Pleroma, Pixelfed, Socialhome), Ostatus (np. GNU Social) i " +"diaspora* (np. diaspora*). Dzięki dodatkowym dodatkom możesz połączyć się z " +"większą liczbą sieci, takimi jak pump.io, Twitter i inne." From 5315497db78f412a7336373b54962d897f32b61b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 18 Mar 2022 17:34:41 +0100 Subject: [PATCH 2/5] the path for the assets has changed --- custom/templates/home.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom/templates/home.tmpl b/custom/templates/home.tmpl index a74d988..2240630 100644 --- a/custom/templates/home.tmpl +++ b/custom/templates/home.tmpl @@ -3,7 +3,7 @@
- +

From 11280b595af2a5119ecb49f07f5cdbbb3ee7b71e Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 18 Mar 2022 17:35:31 +0100 Subject: [PATCH 3/5] the assets path has changed --- generate_home_tmpl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate_home_tmpl.py b/generate_home_tmpl.py index bf985cf..b1f3c8e 100644 --- a/generate_home_tmpl.py +++ b/generate_home_tmpl.py @@ -76,7 +76,7 @@ templateHead = """{{template "base/head" .}}
- +

From 6b17afb929c84b60e6a9a06332eab416c25e8f74 Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 9 May 2024 23:47:05 +0200 Subject: [PATCH 4/5] Prepare repo for Docker & Forgejo --- README.md | 5 ++--- custom/public/{ => assets}/img/favicon.ico | Bin custom/public/{ => assets}/img/favicon.png | Bin custom/public/{ => assets}/img/friendica-128.png | Bin custom/public/{ => assets}/img/friendica-256.png | Bin custom/public/{ => assets}/img/gitea-sm.png | Bin custom/public/robots.txt | 2 ++ 7 files changed, 4 insertions(+), 3 deletions(-) rename custom/public/{ => assets}/img/favicon.ico (100%) rename custom/public/{ => assets}/img/favicon.png (100%) rename custom/public/{ => assets}/img/friendica-128.png (100%) rename custom/public/{ => assets}/img/friendica-256.png (100%) rename custom/public/{ => assets}/img/gitea-sm.png (100%) create mode 100644 custom/public/robots.txt diff --git a/README.md b/README.md index 9d027ac..6b134d2 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ # Custom files for git.friendi.ca These files are the cutsom files for git.friendi.ca. -They are overriding the default template files of gitea. -The content of `custom` needs to be placed in `/var/lib/gitea` and `/usr/share/gitea` (at least at git.friendi.ca). -Files there are accessed in the `assets` path. +They are overriding the default template files of Forgejo. +The content of `custom` is mounted inside the Docker container at `/var/lib/gitea/custom`. ## Translation diff --git a/custom/public/img/favicon.ico b/custom/public/assets/img/favicon.ico similarity index 100% rename from custom/public/img/favicon.ico rename to custom/public/assets/img/favicon.ico diff --git a/custom/public/img/favicon.png b/custom/public/assets/img/favicon.png similarity index 100% rename from custom/public/img/favicon.png rename to custom/public/assets/img/favicon.png diff --git a/custom/public/img/friendica-128.png b/custom/public/assets/img/friendica-128.png similarity index 100% rename from custom/public/img/friendica-128.png rename to custom/public/assets/img/friendica-128.png diff --git a/custom/public/img/friendica-256.png b/custom/public/assets/img/friendica-256.png similarity index 100% rename from custom/public/img/friendica-256.png rename to custom/public/assets/img/friendica-256.png diff --git a/custom/public/img/gitea-sm.png b/custom/public/assets/img/gitea-sm.png similarity index 100% rename from custom/public/img/gitea-sm.png rename to custom/public/assets/img/gitea-sm.png diff --git a/custom/public/robots.txt b/custom/public/robots.txt new file mode 100644 index 0000000..69084d2 --- /dev/null +++ b/custom/public/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: /*/archive/* From 2b6fcd884ca6ec518eaa6cf9bd61453b6049cc65 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Sat, 8 Feb 2025 10:09:19 +0000 Subject: [PATCH 5/5] Various small improvements to the README --- README.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6b134d2..7080718 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ # Custom files for git.friendi.ca -These files are the cutsom files for git.friendi.ca. -They are overriding the default template files of Forgejo. -The content of `custom` is mounted inside the Docker container at `/var/lib/gitea/custom`. +These are the custom files for git.friendi.ca, which override the default template files of Forgejo. +The content of the `custom` directory is mounted inside the Docker container at `/var/lib/gitea/custom`. ## Translation @@ -10,17 +9,17 @@ Translation of the strings can be done at [Transifex](https://www.transifex.com/ ## Workflow -1. Update the strings at the top of the `generate_home_tmpl.py` file, those that start with a `str_` in the name. +1. Update the strings at the top of the `generate_home_tmpl.py` file — those that start with a `str_` in the name. 2. Extract them with `pygettext -p ./lang/C/ generate_home_tmpl.py` 3. Commit the new `messages.pot` file and push it to the repository at git.friendi.ca 4. Wait for Transifex to pick up the changes and the translation teams to make the new translations -5. Download the finished translations to `lang/$lngcode/LC_MESSAGES/messages.pot` -6. Edit the `messages.pot` file and set the characterset to UTF-8. +5. Download the finished translations to `lang/$langcode/LC_MESSAGES/messages.pot` +6. Edit the `messages.pot` file and set the character set to UTF-8: `"Content-Type: text/plain; charset=UTF-8\n"` 7. Convert the `messages.pot` file to `messages.mo` using `msgfmt messages.pot` -8. Run `python3 generate_home_tmpl.py` it will recreate the `custom/templates/home.tmpl` file +8. Run `python3 generate_home_tmpl.py` to recreate the `custom/templates/home.tmpl` file 9. Upload that file and copy it to the `custom/templates/` directory of the gitea instance. ## License -The python script to generate the template file has been released under the terms of the MIT license. +The Python script to generate the template file has been released under the terms of the MIT license.