Skip to content

Commit bbb56df

Browse files
andersktimabbott
authored andcommittedJul 2, 2019
i18n: Move static/locale back to locale.
As of commit cff40c5 (zulip#9300), these files are no longer served directly to the browser. Disentangle them from the static asset pipeline so we can refactor it without worrying about them. This has the side effect of eliminating the accidental duplication of translation data via hash-naming in our release tarballs. This reverts commit b546391 (zulip#1148). Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
1 parent d6f5655 commit bbb56df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+43
-56
lines changed
 

‎.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ package-lock.json
3434
# Dockerfiles generated for CircleCI
3535
/tools/circleci/images
3636

37+
# Generated i18n data
38+
/locale/en
39+
/locale/language_options.json
40+
/locale/language_name_map.json
41+
/locale/*/mobile.json
42+
3743
# Static build
3844
*.mo
3945
npm-debug.log

‎.tx/config

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,32 @@ host = https://www.transifex.com
33
lang_map = zh-Hans: zh_Hans, zh-Hant: zh_Hant
44

55
[zulip.djangopo]
6-
file_filter = static/locale/<lang>/LC_MESSAGES/django.po
7-
source_file = static/locale/en/LC_MESSAGES/django.po
6+
file_filter = locale/<lang>/LC_MESSAGES/django.po
7+
source_file = locale/en/LC_MESSAGES/django.po
88
source_lang = en
99
type = PO
1010

1111
[zulip.translationsjson]
12-
file_filter = static/locale/<lang>/translations.json
13-
source_file = static/locale/en/translations.json
12+
file_filter = locale/<lang>/translations.json
13+
source_file = locale/en/translations.json
1414
source_lang = en
1515
type = KEYVALUEJSON
1616

1717
[zulip.mobile]
18-
file_filter = static/locale/<lang>/mobile.json
19-
source_file = static/locale/en/mobile.json
18+
file_filter = locale/<lang>/mobile.json
19+
source_file = locale/en/mobile.json
2020
source_lang = en
2121
type = KEYVALUEJSON
2222

2323
[zulip-test.djangopo]
24-
file_filter = static/locale/<lang>/LC_MESSAGES/django.po
25-
source_file = static/locale/en/LC_MESSAGES/django.po
24+
file_filter = locale/<lang>/LC_MESSAGES/django.po
25+
source_file = locale/en/LC_MESSAGES/django.po
2626
source_lang = en
2727
type = PO
2828

2929
[zulip-test.translationsjson]
30-
file_filter = static/locale/<lang>/translations.json
31-
source_file = static/locale/en/translations.json
30+
file_filter = locale/<lang>/translations.json
31+
source_file = locale/en/translations.json
3232
source_lang = en
3333
type = KEYVALUEJSON
3434

0 commit comments

Comments
 (0)