From 89a19ba1073e88f44193d5240a022ba8fbd443f1 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 23 Aug 2021 01:25:52 +0100 Subject: [PATCH] If ANNOUNCEMENT_LANGUAGES is empty, use provided list instead. Update default configs to reflect this as new default --- FreeDMR-SAMPLE-commented.cfg | 2 +- config.py | 3 +++ docker-configs/docker-compose_install.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/FreeDMR-SAMPLE-commented.cfg b/FreeDMR-SAMPLE-commented.cfg index d24372c..337d721 100755 --- a/FreeDMR-SAMPLE-commented.cfg +++ b/FreeDMR-SAMPLE-commented.cfg @@ -47,7 +47,7 @@ TGID_TS1_ACL: PERMIT:ALL TGID_TS2_ACL: PERMIT:ALL GEN_STAT_BRIDGES: False ALLOW_NULL_PASSPHRASE: False -ANNOUNCEMENT_LANGUAGES: en_GB,en_GB_2,en_US,es_ES,es_ES_2,fr_FR,de_DE,dk_DK,it_IT,no_NO,pl_PL,se_SE,pt_PT,el_GR,CW +ANNOUNCEMENT_LANGUAGES: SERVER_ID: 0000 diff --git a/config.py b/config.py index afe383b..63a189a 100755 --- a/config.py +++ b/config.py @@ -33,6 +33,7 @@ import const import socket import ipaddress from socket import gethostbyname +from languages import languages # Does anybody read this stuff? There's a PEP somewhere that says I should do this. @@ -147,6 +148,8 @@ def build_config(_config_file): 'SERVER_ID': config.getint(section, 'SERVER_ID').to_bytes(4, 'big') }) + if not CONFIG['GLOBAL']['ANNOUNCEMENT_LANGUAGES']: + CONFIG['GLOBAL']['ANNOUNCEMENT_LANGUAGES'] = languages elif section == 'REPORTS': CONFIG['REPORTS'].update({ diff --git a/docker-configs/docker-compose_install.sh b/docker-configs/docker-compose_install.sh index 788d18a..ca5d40a 100644 --- a/docker-configs/docker-compose_install.sh +++ b/docker-configs/docker-compose_install.sh @@ -40,7 +40,7 @@ TGID_TS1_ACL: PERMIT:ALL TGID_TS2_ACL: PERMIT:ALL GEN_STAT_BRIDGES: True ALLOW_NULL_PASSPHRASE: True -ANNOUNCEMENT_LANGUAGES: en_GB,en_GB_2,en_US,es_ES,es_ES_2,fr_FR,de_DE,dk_DK,it_IT,no_NO,pl_PL,se_SE,CW,cy_GB,el_GR +ANNOUNCEMENT_LANGUAGES: SERVER_ID: 0 [REPORTS]