Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Use a submodule to pull locales from Transifex - #2543

Merged
jsha merged 4 commits into
masterfrom
translations-improvement
Aug 13, 2015
Merged

Use a submodule to pull locales from Transifex#2543
jsha merged 4 commits into
masterfrom
translations-improvement

Conversation

@jsha

@jsha jsha commented Aug 13, 2015

Copy link
Copy Markdown
Member

Previously we would manually copy over locale files from a separately synced
Transifex repo. This formalizes that arrangement by making that Transifex repo a
submodule and pulling in its translations at build time.

This change also makes compare-locales.sh operate on an XPI rather than the repo
directory, and check a file after building, when we expect all the locales to be
incorporated.

Builds should still be reproducible because the submodule sha1 specifies a specific commit.

Fixes #2313.

cc @cooperq for review.

Previously we would manually copy over locale files from a separately synced
Transifex repo. This formalizes that arrangement by making that Transifex repo a
submodule and pulling in its translations at build time.

This change also makes compare-locales.sh operate on an XPI rather than the repo
directory, and check a file after building, when we expect all the locales to be
incorporated.

Fixes #2313.
@cooperq

cooperq commented Aug 13, 2015

Copy link
Copy Markdown
Contributor

your branch has conflicts, but I guess it looks fine other than that.

jsha added 3 commits August 13, 2015 09:56
Conflicts:
	src/chrome/locale/ar/https-everywhere.dtd
	src/chrome/locale/bg/https-everywhere.dtd
	src/chrome/locale/ca/https-everywhere.dtd
	src/chrome/locale/cs/https-everywhere.dtd
	src/chrome/locale/da/https-everywhere.dtd
	src/chrome/locale/de/https-everywhere.dtd
	src/chrome/locale/el/https-everywhere.dtd
	src/chrome/locale/en_GB/https-everywhere.dtd
	src/chrome/locale/es/https-everywhere.dtd
	src/chrome/locale/et/https-everywhere.dtd
	src/chrome/locale/eu/https-everywhere.dtd
	src/chrome/locale/fa/https-everywhere.dtd
	src/chrome/locale/fi/https-everywhere.dtd
	src/chrome/locale/fo/https-everywhere.dtd
	src/chrome/locale/fr/https-everywhere.dtd
	src/chrome/locale/fr_CA/https-everywhere.dtd
	src/chrome/locale/he/https-everywhere.dtd
	src/chrome/locale/hr_HR/https-everywhere.dtd
	src/chrome/locale/hu/https-everywhere.dtd
	src/chrome/locale/it/https-everywhere.dtd
	src/chrome/locale/ja/https-everywhere.dtd
	src/chrome/locale/km/https-everywhere.dtd
	src/chrome/locale/ko/https-everywhere.dtd
	src/chrome/locale/lt/https-everywhere.dtd
	src/chrome/locale/lv/https-everywhere.dtd
	src/chrome/locale/ms_MY/https-everywhere.dtd
	src/chrome/locale/nb/https-everywhere.dtd
	src/chrome/locale/nl/https-everywhere.dtd
	src/chrome/locale/pl/https-everywhere.dtd
	src/chrome/locale/pt/https-everywhere.dtd
	src/chrome/locale/pt_BR/https-everywhere.dtd
	src/chrome/locale/ro/https-everywhere.dtd
	src/chrome/locale/ru/https-everywhere.dtd
	src/chrome/locale/si_LK/https-everywhere.dtd
	src/chrome/locale/sk/https-everywhere.dtd
	src/chrome/locale/sk_SK/https-everywhere.dtd
	src/chrome/locale/sl/https-everywhere.dtd
	src/chrome/locale/sl_SI/https-everywhere.dtd
	src/chrome/locale/sq/https-everywhere.dtd
	src/chrome/locale/sr/https-everywhere.dtd
	src/chrome/locale/sv/https-everywhere.dtd
	src/chrome/locale/th/https-everywhere.dtd
	src/chrome/locale/tr/https-everywhere.dtd
	src/chrome/locale/uk/https-everywhere.dtd
	src/chrome/locale/zh-CN/https-everywhere.dtd
	src/chrome/locale/zh_TW/https-everywhere.dtd
jsha added a commit that referenced this pull request Aug 13, 2015
Use a submodule to pull locales from Transifex
@jsha
jsha merged commit 10fa9ea into master Aug 13, 2015
@Hainish
Hainish deleted the translations-improvement branch December 12, 2016 21:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants