edekakam/webapp-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6 in KSC/webapp-tools from Update-locale-name to master

Browse Source 
* commit '78448d4d4fb06437eff71fc7587f3e255960bc58':
  Change locale to language for better readability
This commit is contained in:
Robin van Genderen
2019-02-13 16:59:29 +01:00
parent d3c0f36c1b 78448d4d4f
commit 3476d46190
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
webapp_admin/webapp_admin.py
View File

@@ -45,7 +45,6 @@ def opt_args(print_help=None):
group.add_option("--location", dest="location", action="store", help="Change location where scripts saves the files")
group.add_option("--file", dest="file", action="store", help="Use specific file")
group.add_option("--backup", dest="backup", action="store_true", help="Backup Webapp settings")
group.add_option("--change-locale", dest="change_locale", action="store", help="Set new locale (e.g. en_GB or nl_NL)")
group.add_option("--restore", dest="restore", action="store_true", help="Restore Webapp settings")
group.add_option("--reset", dest="reset", action="store_true", help="Reset WebApp settings")
parser.add_option_group(group)
@@ -69,6 +68,7 @@ def opt_args(print_help=None):
# WebApp setting option group
group = OptionGroup(parser, "webapp-settings", "")
group.add_option("--language", dest="language", action="store", help="Set new language (e.g. en_GB or nl_NL)")
group.add_option("--theme", dest="theme", action="store", help="Change theme (e.g. dark)")
group.add_option("--free-busy", dest="freebusy", action="store", help="Change free/busy time span in months")
group.add_option("--icons", dest="icons", action="store", help="Change icons (e.g. breeze)")
@@ -168,9 +168,9 @@ def restore(user, filename=None):
Change the language
:param user: The user
:param locale: The language that should be used. Format e.g. "en_GB"
:param language: The language that should be used. Format e.g. "en_GB"
"""
def change_locale(user, locale):
def language(user, language):
settings = read_settings(user)
if not settings['settings']['zarafa']['v1'].get('main'):
settings['settings']['zarafa']['v1']['main'] = {}
@@ -409,8 +409,8 @@ def main():
restore(user, options.file)
# Language
if options.change_locale:
change_locale(user, options.change_locale)
if options.language:
language(user, options.language)
# S/MIME import/export
if options.export_smime: