diff --git a/README.md b/README.md index 7080718..9d027ac 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ # Custom files for git.friendi.ca -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`. +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. ## Translation @@ -9,17 +11,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/$langcode/LC_MESSAGES/messages.pot` -6. Edit the `messages.pot` file and set the character set to UTF-8: +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. `"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` to recreate the `custom/templates/home.tmpl` file +8. Run `python3 generate_home_tmpl.py` it will 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. diff --git a/custom/public/assets/img/favicon.ico b/custom/public/img/favicon.ico similarity index 100% rename from custom/public/assets/img/favicon.ico rename to custom/public/img/favicon.ico diff --git a/custom/public/assets/img/favicon.png b/custom/public/img/favicon.png similarity index 100% rename from custom/public/assets/img/favicon.png rename to custom/public/img/favicon.png diff --git a/custom/public/assets/img/friendica-128.png b/custom/public/img/friendica-128.png similarity index 100% rename from custom/public/assets/img/friendica-128.png rename to custom/public/img/friendica-128.png diff --git a/custom/public/assets/img/friendica-256.png b/custom/public/img/friendica-256.png similarity index 100% rename from custom/public/assets/img/friendica-256.png rename to custom/public/img/friendica-256.png diff --git a/custom/public/assets/img/gitea-sm.png b/custom/public/img/gitea-sm.png similarity index 100% rename from custom/public/assets/img/gitea-sm.png rename to custom/public/img/gitea-sm.png diff --git a/custom/public/robots.txt b/custom/public/robots.txt deleted file mode 100644 index 69084d2..0000000 --- a/custom/public/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: /*/archive/* diff --git a/custom/templates/home.tmpl b/custom/templates/home.tmpl index d6c84ef..d6dd0b3 100644 --- a/custom/templates/home.tmpl +++ b/custom/templates/home.tmpl @@ -193,7 +193,7 @@ Interoperacyjność

- 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. + 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.

diff --git a/generate_home_tmpl.py b/generate_home_tmpl.py index 8de4bac..1b0620f 100644 --- a/generate_home_tmpl.py +++ b/generate_home_tmpl.py @@ -76,7 +76,7 @@ templateHead = """{{template "base/head" .}}
- +

diff --git a/lang/pl-PL/LC_MESSAGES/messages.mo b/lang/pl-PL/LC_MESSAGES/messages.mo index 6a8f30f..05ad211 100644 Binary files a/lang/pl-PL/LC_MESSAGES/messages.mo and b/lang/pl-PL/LC_MESSAGES/messages.mo differ diff --git a/lang/pl-PL/LC_MESSAGES/messages.pot b/lang/pl-PL/LC_MESSAGES/messages.pot index 214a205..9144b8f 100644 --- a/lang/pl-PL/LC_MESSAGES/messages.pot +++ b/lang/pl-PL/LC_MESSAGES/messages.pot @@ -4,14 +4,13 @@ # # Translators: # Waldemar Stoczkowski, 2018 -# Piotr Strębski , 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: Piotr Strębski , 2022\n" +"Last-Translator: Waldemar Stoczkowski, 2018\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" @@ -50,16 +49,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" @@ -88,7 +87,3 @@ 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."