Verified Commit d0fd4055 authored by Karel Koci's avatar Karel Koci 🤘 Committed by Josef Schlehofer
Browse files

userlists: add list 3xmigrate

This list is intended as a easy and bullet proof way of triggering
optional migration.

This also fixed script that generates pot files. It swaps what file is
merged to which. This is correct order as otherwise new strings are
marked as old ones in output.
parent 5c9d9f7a
......@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=userlists
PKG_VERSION:=11.8
PKG_VERSION:=11.9
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
......
{
"3xmigrate": {
"title": "Migration to Turris OS 5.x (HIGHLY EXPERIMENTAL)",
"description": "This is experimental migration to the latest version of Turris OS. Make sure that you thoroughly read https://docs.turris.cz/geek/tos3_migration/ before enabling this!",
"visible": true
},
"api-token": {
"title": "Access tokens",
"description": "A Foris plugin allowing to manage remote API access tokens (for example for use in Spectator or Android application).",
......
......@@ -51,7 +51,9 @@ for name, lst in content.items():
# Merge with previous version
if os.path.isfile(OUT):
po.merge(polib.pofile(OUT))
existing_po = polib.pofile(OUT)
existing_po.merge(po)
po = existing_po
# Save new version
po.save(OUT)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment