diff options
| author | Micah Lee <micah@micahflee.com> | 2018-09-17 21:03:37 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2018-09-17 21:03:37 -0700 |
| commit | fc0defe0c2dd1f958cb91925f70911d70284c7bd (patch) | |
| tree | 9486bc2d71f4216d4536c48e5c31b6c4551e23e6 /install | |
| parent | ef71c351c6042c98a8473821cd0fa2518322db3d (diff) | |
| parent | 06f90b91ce55f1a51d15b26a1df5f9c4e866567f (diff) | |
| download | onionshare-fc0defe0c2dd1f958cb91925f70911d70284c7bd.tar.gz onionshare-fc0defe0c2dd1f958cb91925f70911d70284c7bd.zip | |
Merge branch 'develop' into update-deps
Diffstat (limited to 'install')
| -rw-r--r-- | install/check_lacked_trans.py | 15 | ||||
| -rw-r--r-- | install/get-tor-osx.py | 2 | ||||
| -rw-r--r-- | install/get-tor-windows.py | 2 | ||||
| -rw-r--r-- | install/licenses/license-onionshare.txt | 3 | ||||
| -rwxr-xr-x | install/scripts/onionshare | 2 | ||||
| -rwxr-xr-x | install/scripts/onionshare-gui | 2 | ||||
| -rw-r--r-- | install/scripts/onionshare-pyinstaller | 2 |
7 files changed, 16 insertions, 12 deletions
diff --git a/install/check_lacked_trans.py b/install/check_lacked_trans.py index 3313db7c..027edab1 100644 --- a/install/check_lacked_trans.py +++ b/install/check_lacked_trans.py @@ -54,7 +54,12 @@ def main(): dir = args.onionshare_dir - src = files_in(dir, 'onionshare') + files_in(dir, 'onionshare_gui') + src = files_in(dir, 'onionshare') + \ + files_in(dir, 'onionshare_gui') + \ + files_in(dir, 'onionshare_gui/share_mode') + \ + files_in(dir, 'onionshare_gui/receive_mode') + \ + files_in(dir, 'install/scripts') + \ + files_in(dir, 'test') pysrc = [p for p in src if p.endswith('.py')] lang_code = args.lang_code @@ -64,11 +69,11 @@ def main(): for line in fileinput.input(pysrc, openhook=fileinput.hook_encoded('utf-8')): # search `strings._('translate_key')` # `strings._('translate_key', True)` - m = re.search(r'strings\._\((.*?)\)', line) + m = re.findall(r'strings\._\((.*?)\)', line) if m: - arg = m.group(1) - key = arg.split(',')[0].strip('''"' ''') - translate_keys.add(key) + for match in m: + key = match.split(',')[0].strip('''"' ''') + translate_keys.add(key) if args.show_all_keys: for k in sorted(translate_keys): diff --git a/install/get-tor-osx.py b/install/get-tor-osx.py index 452fadf3..845f887c 100644 --- a/install/get-tor-osx.py +++ b/install/get-tor-osx.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/install/get-tor-windows.py b/install/get-tor-windows.py index 67e41362..0d16dd29 100644 --- a/install/get-tor-windows.py +++ b/install/get-tor-windows.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/install/licenses/license-onionshare.txt b/install/licenses/license-onionshare.txt index dc049cff..77d05583 100644 --- a/install/licenses/license-onionshare.txt +++ b/install/licenses/license-onionshare.txt @@ -1,5 +1,4 @@ -OnionShare -Copyright © 2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/install/scripts/onionshare b/install/scripts/onionshare index 6c560aec..e2205e04 100755 --- a/install/scripts/onionshare +++ b/install/scripts/onionshare @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/install/scripts/onionshare-gui b/install/scripts/onionshare-gui index 6b9fb21b..fed29d83 100755 --- a/install/scripts/onionshare-gui +++ b/install/scripts/onionshare-gui @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/install/scripts/onionshare-pyinstaller b/install/scripts/onionshare-pyinstaller index d026e1bf..bd59b421 100644 --- a/install/scripts/onionshare-pyinstaller +++ b/install/scripts/onionshare-pyinstaller @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |