Commit graph

2 commits

Author SHA1 Message Date
Hannu Nyman
e4baee8d25 build/i18n-merge-master: ignore apps deleted in master
Refine the code to ignore apps that have been deleted from master
but still exist in release branches. E.g. luci-app-samba

Previously the unhandled git error from non-existing master
mangled the .po files in the release branch: the 18n header was
removed and all non-ASCII chars were deleted from translation.

Fix this by processing only those files where 'git show' succeeds.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-05-13 18:06:31 +03:00
Jo-Philipp Wich
ea3624bee9 build: add script to merge master translation into branches
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit cab574958c)
2020-01-29 08:40:39 +01:00