mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-28 15:30:10 +02:00
standardize on "Application ID" in UI text
This commit is contained in:
parent
9c852d4e8d
commit
5e1377c77a
@ -873,7 +873,7 @@ def parse_commandline():
|
|||||||
|
|
||||||
parser = argparse.ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
|
parser = argparse.ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
|
||||||
common.setup_global_opts(parser)
|
common.setup_global_opts(parser)
|
||||||
parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
|
parser.add_argument("appid", nargs='*', help=_("application ID with optional versionCode in the form APPID[:VERCODE]"))
|
||||||
parser.add_argument("-l", "--latest", action="store_true", default=False,
|
parser.add_argument("-l", "--latest", action="store_true", default=False,
|
||||||
help=_("Build only the latest version of each package"))
|
help=_("Build only the latest version of each package"))
|
||||||
parser.add_argument("-s", "--stop", action="store_true", default=False,
|
parser.add_argument("-s", "--stop", action="store_true", default=False,
|
||||||
|
@ -599,7 +599,7 @@ def main():
|
|||||||
# Parse command line...
|
# Parse command line...
|
||||||
parser = ArgumentParser(usage="%(prog)s [options] [APPID [APPID ...]]")
|
parser = ArgumentParser(usage="%(prog)s [options] [APPID [APPID ...]]")
|
||||||
common.setup_global_opts(parser)
|
common.setup_global_opts(parser)
|
||||||
parser.add_argument("appid", nargs='*', help=_("applicationId to check for updates"))
|
parser.add_argument("appid", nargs='*', help=_("application ID of file to operate on"))
|
||||||
parser.add_argument("--auto", action="store_true", default=False,
|
parser.add_argument("--auto", action="store_true", default=False,
|
||||||
help=_("Process auto-updates"))
|
help=_("Process auto-updates"))
|
||||||
parser.add_argument("--autoonly", action="store_true", default=False,
|
parser.add_argument("--autoonly", action="store_true", default=False,
|
||||||
|
@ -1656,7 +1656,7 @@ def parse_androidmanifests(paths, app):
|
|||||||
max_version = "Unknown"
|
max_version = "Unknown"
|
||||||
|
|
||||||
if max_package:
|
if max_package:
|
||||||
msg = _("Invalid package name {0}").format(max_package)
|
msg = _("Invalid application ID {appid}").format(appid=max_package)
|
||||||
if not is_valid_package_name(max_package):
|
if not is_valid_package_name(max_package):
|
||||||
raise FDroidException(msg)
|
raise FDroidException(msg)
|
||||||
elif not is_strict_application_id(max_package):
|
elif not is_strict_application_id(max_package):
|
||||||
|
@ -50,7 +50,7 @@ def main():
|
|||||||
# Parse command line...
|
# Parse command line...
|
||||||
parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
|
parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
|
||||||
common.setup_global_opts(parser)
|
common.setup_global_opts(parser)
|
||||||
parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
|
parser.add_argument("appid", nargs='*', help=_("application ID with optional versionCode in the form APPID[:VERCODE]"))
|
||||||
parser.add_argument("-a", "--all", action="store_true", default=False,
|
parser.add_argument("-a", "--all", action="store_true", default=False,
|
||||||
help=_("Install all signed applications available"))
|
help=_("Install all signed applications available"))
|
||||||
options = parser.parse_args()
|
options = parser.parse_args()
|
||||||
|
@ -278,7 +278,7 @@ def check_old_links(app):
|
|||||||
|
|
||||||
def check_useless_fields(app):
|
def check_useless_fields(app):
|
||||||
if app.UpdateCheckName == app.id:
|
if app.UpdateCheckName == app.id:
|
||||||
yield _("Update Check Name is set to the known app id - it can be removed")
|
yield _("UpdateCheckName is set to the known application ID, it can be removed")
|
||||||
|
|
||||||
|
|
||||||
filling_ucms = re.compile(r'^(Tags.*|RepoManifest.*)')
|
filling_ucms = re.compile(r'^(Tags.*|RepoManifest.*)')
|
||||||
@ -575,7 +575,7 @@ def main():
|
|||||||
parser.add_argument('--force-yamllint', action="store_true", default=False,
|
parser.add_argument('--force-yamllint', action="store_true", default=False,
|
||||||
help=_("When linting the entire repository yamllint is disabled by default. "
|
help=_("When linting the entire repository yamllint is disabled by default. "
|
||||||
"This option forces yamllint regardless."))
|
"This option forces yamllint regardless."))
|
||||||
parser.add_argument("appid", nargs='*', help=_("applicationId in the form APPID"))
|
parser.add_argument("appid", nargs='*', help=_("application ID of file to operate on"))
|
||||||
metadata.add_metadata_arguments(parser)
|
metadata.add_metadata_arguments(parser)
|
||||||
options = parser.parse_args()
|
options = parser.parse_args()
|
||||||
metadata.warnings_action = options.W
|
metadata.warnings_action = options.W
|
||||||
|
@ -1189,11 +1189,13 @@ class DescriptionResolver:
|
|||||||
if appid in self.apps:
|
if appid in self.apps:
|
||||||
if self.apps[appid].Name:
|
if self.apps[appid].Name:
|
||||||
return "fdroid.app:" + appid, self.apps[appid].Name
|
return "fdroid.app:" + appid, self.apps[appid].Name
|
||||||
raise MetaDataException("Cannot resolve app id " + appid)
|
raise MetaDataException(_('Cannot resolve application ID {appid}')
|
||||||
|
.format(appid=appid))
|
||||||
|
|
||||||
|
|
||||||
class DummyDescriptionResolver(DescriptionResolver):
|
class DummyDescriptionResolver(DescriptionResolver):
|
||||||
def resolve_description_link(self, appid):
|
def resolve_description_link(self, appid):
|
||||||
if appid in self.apps:
|
if appid in self.apps:
|
||||||
return "fdroid.app:" + appid, "Dummy name - don't know yet"
|
return "fdroid.app:" + appid, "Dummy name - don't know yet"
|
||||||
_warn_or_exception(_("Cannot resolve app id {appid}").format(appid=appid))
|
_warn_or_exception(_('Cannot resolve application ID {appid}')
|
||||||
|
.format(appid=appid))
|
||||||
|
@ -225,7 +225,7 @@ def main():
|
|||||||
"[APPID[:VERCODE] [APPID[:VERCODE] ...]]")
|
"[APPID[:VERCODE] [APPID[:VERCODE] ...]]")
|
||||||
common.setup_global_opts(parser)
|
common.setup_global_opts(parser)
|
||||||
parser.add_argument("appid", nargs='*',
|
parser.add_argument("appid", nargs='*',
|
||||||
help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
|
help=_("application ID with optional versionCode in the form APPID[:VERCODE]"))
|
||||||
metadata.add_metadata_arguments(parser)
|
metadata.add_metadata_arguments(parser)
|
||||||
options = parser.parse_args()
|
options = parser.parse_args()
|
||||||
metadata.warnings_action = options.W
|
metadata.warnings_action = options.W
|
||||||
|
@ -54,7 +54,7 @@ def main():
|
|||||||
common.setup_global_opts(parser)
|
common.setup_global_opts(parser)
|
||||||
parser.add_argument("-l", "--list", action="store_true", default=False,
|
parser.add_argument("-l", "--list", action="store_true", default=False,
|
||||||
help=_("List files that would be reformatted"))
|
help=_("List files that would be reformatted"))
|
||||||
parser.add_argument("appid", nargs='*', help=_("applicationId in the form APPID"))
|
parser.add_argument("appid", nargs='*', help=_("application ID of file to operate on"))
|
||||||
metadata.add_metadata_arguments(parser)
|
metadata.add_metadata_arguments(parser)
|
||||||
options = parser.parse_args()
|
options = parser.parse_args()
|
||||||
metadata.warnings_action = options.W
|
metadata.warnings_action = options.W
|
||||||
|
@ -373,7 +373,7 @@ def main():
|
|||||||
# Parse command line...
|
# Parse command line...
|
||||||
parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
|
parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
|
||||||
common.setup_global_opts(parser)
|
common.setup_global_opts(parser)
|
||||||
parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
|
parser.add_argument("appid", nargs='*', help=_("application ID with optional versionCode in the form APPID[:VERCODE]"))
|
||||||
parser.add_argument("-f", "--force", action="store_true", default=False,
|
parser.add_argument("-f", "--force", action="store_true", default=False,
|
||||||
help=_("Force scan of disabled apps and builds."))
|
help=_("Force scan of disabled apps and builds."))
|
||||||
parser.add_argument("--json", action="store_true", default=False,
|
parser.add_argument("--json", action="store_true", default=False,
|
||||||
|
@ -1356,7 +1356,7 @@ def scan_apk(apk_file):
|
|||||||
raise BuildException(_("{appid} from {path} is not a valid Java Package Name!")
|
raise BuildException(_("{appid} from {path} is not a valid Java Package Name!")
|
||||||
.format(appid=apk['packageName'], path=apk_file))
|
.format(appid=apk['packageName'], path=apk_file))
|
||||||
elif not common.is_strict_application_id(apk['packageName']):
|
elif not common.is_strict_application_id(apk['packageName']):
|
||||||
logging.warning(_("{appid} from {path} is not a valid Android Package Name!")
|
logging.warning(_("{appid} from {path} is not a valid Android application ID!")
|
||||||
.format(appid=apk['packageName'], path=apk_file))
|
.format(appid=apk['packageName'], path=apk_file))
|
||||||
|
|
||||||
# Get the signature, or rather the signing key fingerprints
|
# Get the signature, or rather the signing key fingerprints
|
||||||
@ -2126,7 +2126,7 @@ def create_metadata_from_template(apk):
|
|||||||
metatxt,
|
metatxt,
|
||||||
flags=re.IGNORECASE | re.MULTILINE)
|
flags=re.IGNORECASE | re.MULTILINE)
|
||||||
else:
|
else:
|
||||||
logging.warning(_('{appid} does not have a name! Using package name instead.')
|
logging.warning(_('{appid} does not have a name! Using application ID instead.')
|
||||||
.format(appid=apk['packageName']))
|
.format(appid=apk['packageName']))
|
||||||
metatxt = re.sub(r'^(((Auto)?Name|Summary):).*$',
|
metatxt = re.sub(r'^(((Auto)?Name|Summary):).*$',
|
||||||
r'\1 ' + apk['packageName'],
|
r'\1 ' + apk['packageName'],
|
||||||
@ -2152,7 +2152,7 @@ def create_metadata_from_template(apk):
|
|||||||
if 'name' in apk and apk['name'] != '':
|
if 'name' in apk and apk['name'] != '':
|
||||||
app['Name'] = apk['name']
|
app['Name'] = apk['name']
|
||||||
else:
|
else:
|
||||||
logging.warning(_('{appid} does not have a name! Using package name instead.')
|
logging.warning(_('{appid} does not have a name! Using application ID instead.')
|
||||||
.format(appid=apk['packageName']))
|
.format(appid=apk['packageName']))
|
||||||
app['Name'] = apk['packageName']
|
app['Name'] = apk['packageName']
|
||||||
with open(os.path.join('metadata', apk['packageName'] + '.yml'), 'w') as f:
|
with open(os.path.join('metadata', apk['packageName'] + '.yml'), 'w') as f:
|
||||||
|
@ -121,7 +121,7 @@ def main():
|
|||||||
# Parse command line...
|
# Parse command line...
|
||||||
parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
|
parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
|
||||||
common.setup_global_opts(parser)
|
common.setup_global_opts(parser)
|
||||||
parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
|
parser.add_argument("appid", nargs='*', help=_("application ID with optional versionCode in the form APPID[:VERCODE]"))
|
||||||
parser.add_argument("--reuse-remote-apk", action="store_true", default=False,
|
parser.add_argument("--reuse-remote-apk", action="store_true", default=False,
|
||||||
help=_("Verify against locally cached copy rather than redownloading."))
|
help=_("Verify against locally cached copy rather than redownloading."))
|
||||||
parser.add_argument("--output-json", action="store_true", default=False,
|
parser.add_argument("--output-json", action="store_true", default=False,
|
||||||
|
@ -5,9 +5,9 @@
|
|||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: fdroidserver 1.1-680-ge1d3de71\n"
|
"Project-Id-Version: fdroidserver 1.1-681-gc19e8952\n"
|
||||||
"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
|
"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
|
||||||
"POT-Creation-Date: 2020-10-01 12:34+0200\n"
|
"POT-Creation-Date: 2020-10-01 12:22+0200\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
@ -371,24 +371,15 @@ msgid_plural "Can't build due to {} errors while scanning"
|
|||||||
msgstr[0] ""
|
msgstr[0] ""
|
||||||
msgstr[1] ""
|
msgstr[1] ""
|
||||||
|
|
||||||
#: ../fdroidserver/metadata.py
|
|
||||||
#, python-brace-format
|
|
||||||
msgid "Cannot find a packageName for {path}!"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: ../fdroidserver/metadata.py
|
|
||||||
#, python-brace-format
|
|
||||||
msgid "Cannot find an appid for {path}!"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: ../fdroidserver/vmtools.py
|
#: ../fdroidserver/vmtools.py
|
||||||
#, python-brace-format
|
#, python-brace-format
|
||||||
msgid "Cannot read \"{path}\"!"
|
msgid "Cannot read \"{path}\"!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#. Translators: https://developer.android.com/studio/build/application-id
|
||||||
#: ../fdroidserver/metadata.py
|
#: ../fdroidserver/metadata.py
|
||||||
#, python-brace-format
|
#, python-brace-format
|
||||||
msgid "Cannot resolve app id {appid}"
|
msgid "Cannot resolve application ID {appid}"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../fdroidserver/rewritemeta.py
|
#: ../fdroidserver/rewritemeta.py
|
||||||
@ -483,6 +474,7 @@ msgstr ""
|
|||||||
msgid "Could not parse size \"{size}\", wrong type \"{type}\""
|
msgid "Could not parse size \"{size}\", wrong type \"{type}\""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#. Translators: https://developer.android.com/studio/build/application-id
|
||||||
#: ../fdroidserver/import.py
|
#: ../fdroidserver/import.py
|
||||||
msgid "Couldn't find Application ID"
|
msgid "Couldn't find Application ID"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -998,6 +990,11 @@ msgstr ""
|
|||||||
msgid "Invalid VercodeOperation: {field}"
|
msgid "Invalid VercodeOperation: {field}"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: ../fdroidserver/common.py
|
||||||
|
#, python-brace-format
|
||||||
|
msgid "Invalid application ID {appid}"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: ../fdroidserver/metadata.py
|
#: ../fdroidserver/metadata.py
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Invalid boolean '%s'"
|
msgid "Invalid boolean '%s'"
|
||||||
@ -1864,8 +1861,9 @@ msgstr ""
|
|||||||
msgid "Unused scanignore path: %s"
|
msgid "Unused scanignore path: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#. Translators: https://developer.android.com/studio/build/application-id
|
||||||
#: ../fdroidserver/lint.py
|
#: ../fdroidserver/lint.py
|
||||||
msgid "Update Check Name is set to the known app id - it can be removed"
|
msgid "Update Check Name is set to the known application ID - it can be removed"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../fdroid ../fdroidserver/__main__.py
|
#: ../fdroid ../fdroidserver/__main__.py
|
||||||
@ -1899,6 +1897,10 @@ msgstr ""
|
|||||||
msgid "UpdateCheckData not a valid URL: {url}"
|
msgid "UpdateCheckData not a valid URL: {url}"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: ../fdroidserver/lint.py
|
||||||
|
msgid "UpdateCheckName is set to the known application ID, it can be removed"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: ../fdroidserver/server.py
|
#: ../fdroidserver/server.py
|
||||||
#, python-brace-format
|
#, python-brace-format
|
||||||
msgid "Uploading {apkfilename} to androidobservatory.org"
|
msgid "Uploading {apkfilename} to androidobservatory.org"
|
||||||
@ -2045,6 +2047,17 @@ msgstr ""
|
|||||||
msgid "apksigner not found, it's required for signing!"
|
msgid "apksigner not found, it's required for signing!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
|
||||||
|
#: ../fdroidserver/checkupdates.py
|
||||||
|
msgid "application ID of file to operate on"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: ../fdroidserver/verify.py ../fdroidserver/publish.py
|
||||||
|
#: ../fdroidserver/build.py ../fdroidserver/scanner.py
|
||||||
|
#: ../fdroidserver/install.py
|
||||||
|
msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
|
#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
|
||||||
msgid "applicationId in the form APPID"
|
msgid "applicationId in the form APPID"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -2538,6 +2551,11 @@ msgstr ""
|
|||||||
msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
|
msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: ../fdroidserver/update.py
|
||||||
|
#, python-brace-format
|
||||||
|
msgid "{appid} does not have a name! Using application ID instead."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: ../fdroidserver/update.py
|
#: ../fdroidserver/update.py
|
||||||
#, python-brace-format
|
#, python-brace-format
|
||||||
msgid "{appid} does not have a name! Using package name instead."
|
msgid "{appid} does not have a name! Using package name instead."
|
||||||
@ -2548,6 +2566,11 @@ msgstr ""
|
|||||||
msgid "{appid} from {path} is not a valid Android Package Name!"
|
msgid "{appid} from {path} is not a valid Android Package Name!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: ../fdroidserver/update.py
|
||||||
|
#, python-brace-format
|
||||||
|
msgid "{appid} from {path} is not a valid Android application ID!"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: ../fdroidserver/metadata.py ../fdroidserver/update.py
|
#: ../fdroidserver/metadata.py ../fdroidserver/update.py
|
||||||
#, python-brace-format
|
#, python-brace-format
|
||||||
msgid "{appid} from {path} is not a valid Java Package Name!"
|
msgid "{appid} from {path} is not a valid Java Package Name!"
|
||||||
|
Loading…
Reference in New Issue
Block a user