Merge branch 'develop' into update-deps

This commit is contained in:
Micah Lee 2018-09-17 21:03:37 -07:00
commit fc0defe0c2
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
70 changed files with 3111 additions and 1163 deletions

View file

@ -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):

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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