napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Packages module: improve translated progress reporting

Browse Source 
- Reduce number of strings a bit
 - Less confusing translation requirements (I hope)
 - Report on progress between groups
This commit is contained in:
Adriaan de Groot 2017-08-31 03:51:18 -04:00
parent 44262951a1
commit a4f4d417a2
1 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/modules/packages/main.py
View File

@ -38,8 +38,9 @@ _ = _translation.gettext
_n = _translation.ngettext _n = _translation.ngettext
total_packages = 0 total_packages = 0 # For the entire job
completed_packages = 0 completed_packages = 0 # Done so far for this job
group_packages = 0 # One group of packages from an -install or -remove entry
INSTALL = object() INSTALL = object()
REMOVE = object() REMOVE = object()
@ -53,38 +54,22 @@ def _change_mode(mode):
def pretty_name(): def pretty_name():
if mode_packages is INSTALL: if not group_packages:
if not total_packages: # Outside the context of an operation
return _("Install packages.") s = _("Processing packages (%(count)d / %(total)d)")
elif not completed_packages: elif mode_packages is INSTALL:
return _n("Installing package.", s = _n("Installing one package.",
"Installing %(num)d packages.", total_packages) % \ "Installing %(num)d packages.", group_packages)
{"num": total_packages}
elif completed_packages < total_packages:
return _n("Installing package, %(count)d of one.",
"Installing packages, %(count)d of %(total)d.") % \
{"total": total_packages, "count": completed_packages}
else:
return _n("Installed one package.",
"Installed %(num)d packages.", total_packages) % \
{"num": total_packages}
elif mode_packages is REMOVE: elif mode_packages is REMOVE:
if not total_packages: s = _n("Removing one package.",
return _("Remove packages.") "Removing %(num)d packages.", group_packages)
elif not completed_packages:
return _n("Removing package.",
"Removing %(num)d packages.", total_packages) % \
{"num": total_packages}
elif completed_packages < total_packages:
return _("Removing packages, %(count)d of %(total)d.") % \
{"total": total_packages, "count": completed_packages}
else:
return _n("Removed one package.",
"Removed %(num)d packages.", total_packages) % \
{"num": total_packages}
else: else:
# No mode, generic description # No mode, generic description
return _("Install packages.") s = _("Install packages.")
return s % {"num": group_packages,
"count": completed_packages,
"total": total_packages}
class PackageManager(metaclass=abc.ABCMeta): class PackageManager(metaclass=abc.ABCMeta):
@ -364,10 +349,11 @@ def run_operations(pkgman, entry):
:param pkgman: :param pkgman:
:param entry: :param entry:
""" """
global completed_packages, mode_packages global group_packages, completed_packages, mode_packages
for key in entry.keys(): for key in entry.keys():
entry[key] = subst_locale(entry[key]) entry[key] = subst_locale(entry[key])
group_packages = len(entry[key])
if key == "install": if key == "install":
_change_mode(INSTALL) _change_mode(INSTALL)
if all([isinstance(x, str) for x in entry[key]]): if all([isinstance(x, str) for x in entry[key]]):
@ -406,6 +392,9 @@ def run_operations(pkgman, entry):
libcalamares.job.setprogress(completed_packages * 1.0 / total_packages) libcalamares.job.setprogress(completed_packages * 1.0 / total_packages)
libcalamares.utils.debug(pretty_name()) libcalamares.utils.debug(pretty_name())
group_packages = 0
_change_mode(None)
def run(): def run():
""" """
@ -414,7 +403,7 @@ def run():
:return: :return:
""" """
global mode_packages, total_packages, completed_packages global mode_packages, total_packages, completed_packages, group_packages
backend = libcalamares.job.configuration.get("backend") backend = libcalamares.job.configuration.get("backend")
@ -445,9 +434,13 @@ def run():
return None return None
for entry in operations: for entry in operations:
group_packages = 0
libcalamares.utils.debug(pretty_name())
run_operations(pkgman, entry) run_operations(pkgman, entry)
mode_packages = None mode_packages = None
libcalamares.job.setprogress(1.0) libcalamares.job.setprogress(1.0)
libcalamares.utils.debug(pretty_name())
return None return None