From 09d081fb17b6b4203f98814941f3b8e97cbf1dbd Mon Sep 17 00:00:00 2001 From: zilliu Date: Fri, 11 Dec 2020 07:51:15 +0000 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=8C=90=20Translated=20using=20Weblate?= =?UTF-8?q?=20(Chinese=20(Simplified))?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (193 of 193 strings) Translation: Lufi/Default theme Translate-URL: https://weblate.framasoft.org/projects/lufi/default-theme/zh_Hans/ --- themes/default/lib/Lufi/I18N/zh_Hans.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/default/lib/Lufi/I18N/zh_Hans.po b/themes/default/lib/Lufi/I18N/zh_Hans.po index 6445020..ebba92c 100644 --- a/themes/default/lib/Lufi/I18N/zh_Hans.po +++ b/themes/default/lib/Lufi/I18N/zh_Hans.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2020-12-06 15:52+0000\n" +"PO-Revision-Date: 2020-12-12 07:52+0000\n" "Last-Translator: zilliu \n" "Language-Team: Chinese (Simplified) \n" @@ -359,7 +359,7 @@ msgstr "如果您选择了一个有效期，则文件会在有效期过后删除 #: themes/default/templates/mail.html.ep:15 msgid "If you send the mail from this server, the links will be sent to the server, which may lower your privacy protection." -msgstr "如果您从这台服务器寄出邮件，那么所有链接都将会被发送到服务器上，这会减弱您的私隐防护。" +msgstr "如果您从这台服务器寄出邮件，那么所有链接都将会被发送到服务器上，这会减弱您的隐私防护。" #: themes/default/templates/files.html.ep:14 msgid "Import localStorage data" @@ -487,7 +487,7 @@ msgstr "请检查您的验证信息或对于此服务的访问权限：无法验 #: themes/default/templates/about.html.ep:5 msgid "Privacy" -msgstr "私隐" +msgstr "隐私" #: themes/default/templates/files.html.ep:13 msgid "Purge expired files from localStorage" From da527b8595234d289a8a97450d98f3d103740776 Mon Sep 17 00:00:00 2001 From: mtmn Date: Wed, 23 Dec 2020 01:20:50 +0100 Subject: [PATCH 2/4] feat(build): parametrize make variables Summary: this enables passing environment variables without touching the `Makefile` (i.e. `LOCAL_SWIFT_PORT=8081 make swift`) --- Makefile | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 5071551..1ce80b8 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,14 @@ -EXTRACTDIR=-D lib -D themes/default/templates -POT=themes/default/lib/Lufi/I18N/lufi.pot -ENPO=themes/default/lib/Lufi/I18N/en.po -XGETTEXT=carton exec local/bin/xgettext.pl -u -CARTON=carton exec -REAL_LUFI=script/application -LUFI=script/lufi +EXTRACTDIR ?= -D lib -D themes/default/templates +POT ?= themes/default/lib/Lufi/I18N/lufi.pot +ENPO ?= themes/default/lib/Lufi/I18N/en.po +XGETTEXT ?= carton exec local/bin/xgettext.pl -u +CARTON ?= carton exec +REAL_LUFI ?= script/application +LUFI ?= script/lufi +LOCAL_SWIFT_PORT ?= 8080 +LOCAL_LDAP_PORT ?= 389 +SWIFT_CONTAINER_IMAGE ?= swiftstack/picoswiftstack:latest + locales: $(XGETTEXT) $(EXTRACTDIR) -o $(POT) 2>/dev/null @@ -26,12 +30,12 @@ dev: clean $(CARTON) morbo $(LUFI) --listen http://0.0.0.0:3000 --watch lib/ --watch script/ --watch themes/ --watch lufi.conf ldap: - sudo docker run --privileged -d -p 389:389 rroemhild/test-openldap; exit 0 + sudo docker run --privileged -d -p $(LOCAL_LDAP_PORT):389 rroemhild/test-openldap; exit 0 ldapdev: ldap dev swift: - sudo docker run -d --rm -p 8080:8080 --hostname="picoswiftstack" --name="picoswiftstack" swiftstack/picoswiftstack; exit 0 + sudo docker run -d --rm -p $(LOCAL_SWIFT_PORT):8080 --hostname="picoswiftstack" --name="picoswiftstack" $(SWIFT_CONTAINER_IMAGE); exit 0 @echo "Sleeping 20 seconds to let picoswiftstack start" @sleep 20 sudo docker exec picoswiftstack get_auth From 1e3fe69eeeccdcb33723365af0462d0e91a98e6f Mon Sep 17 00:00:00 2001 From: mtmn Date: Wed, 23 Dec 2020 11:15:26 +0100 Subject: [PATCH 3/4] feat(build): parametrize morbo server host and port --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1ce80b8..0ef3308 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,8 @@ LUFI ?= script/lufi LOCAL_SWIFT_PORT ?= 8080 LOCAL_LDAP_PORT ?= 389 SWIFT_CONTAINER_IMAGE ?= swiftstack/picoswiftstack:latest +MORBO_HOST ?= 0.0.0.0 +MORBO_PORT ?= 3030 locales: @@ -27,7 +29,7 @@ clean: rm -rf lufi.db files/ dev: clean - $(CARTON) morbo $(LUFI) --listen http://0.0.0.0:3000 --watch lib/ --watch script/ --watch themes/ --watch lufi.conf + $(CARTON) morbo $(LUFI) --listen http://$(MORBO_HOST):$(MORBO_PORT) --watch lib/ --watch script/ --watch themes/ --watch lufi.conf ldap: sudo docker run --privileged -d -p $(LOCAL_LDAP_PORT):389 rroemhild/test-openldap; exit 0 From ea9fe56c89433cbf0e122003320870b42b650e72 Mon Sep 17 00:00:00 2001 From: mtmn Date: Wed, 23 Dec 2020 11:17:16 +0100 Subject: [PATCH 4/4] feat(build): parametrize ldap container image --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0ef3308..2feaa73 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,9 @@ XGETTEXT ?= carton exec local/bin/xgettext.pl -u CARTON ?= carton exec REAL_LUFI ?= script/application LUFI ?= script/lufi -LOCAL_SWIFT_PORT ?= 8080 +LDAP_CONTAINER_IMAGE ?= rroemhild/test-openldap:latest LOCAL_LDAP_PORT ?= 389 +LOCAL_SWIFT_PORT ?= 8080 SWIFT_CONTAINER_IMAGE ?= swiftstack/picoswiftstack:latest MORBO_HOST ?= 0.0.0.0 MORBO_PORT ?= 3030 @@ -32,7 +33,7 @@ dev: clean $(CARTON) morbo $(LUFI) --listen http://$(MORBO_HOST):$(MORBO_PORT) --watch lib/ --watch script/ --watch themes/ --watch lufi.conf ldap: - sudo docker run --privileged -d -p $(LOCAL_LDAP_PORT):389 rroemhild/test-openldap; exit 0 + sudo docker run --privileged -d -p $(LOCAL_LDAP_PORT):389 $(LDAP_CONTAINER_IMAGE); exit 0 ldapdev: ldap dev