[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[master] Remove definite articles in the bootloader translation strings.



The following sentence is hard to translate:

_("The %s is huge.") % object , where object is taken from dictionary or an
array somewhere, e.g. [_("dog"), _("bird")]. In some languages
(Danish for instance) the article is sometimes part of the object word and
sometimes not, so depending on the article 'dog' could be either

'hunden' or 'en hund'.

In those cases the translater doesn't know how to translate the original
sentence without looking at the code. We shouldn't be composing sentences
in this way and avoid using definite/indefinite articles where we do. (The
only perfect solution though is to have all possible sentences listed and
not construct them).

A similar problem arises e.g. with word order that changes among languages
and capital letters.

Resolves: rhbz#713278
---
 pyanaconda/bootloader.py |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 73ef393..e47bd1e 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -370,13 +370,13 @@ class BootLoader(object):
 
         if raid_levels and device.level not in raid_levels:
             levels_str = ",".join("RAID%d" % l for l in raid_levels)
-            self.errors.append(_("RAID sets containing the %s must have one "
+            self.errors.append(_("RAID sets that contain: %s must have one "
                                  "of the following raid levels: %s.")
                                % (desc, levels_str))
             ret = False
 
         if metadata and device.metadataVersion not in metadata:
-            self.errors.append(_("RAID sets containing the %s must have one "
+            self.errors.append(_("RAID sets that contain: %s must have one "
                                  "of the following metadata versions: %s.")
                                % (desc, ",".join(metadata)))
             ret = False
@@ -384,7 +384,7 @@ class BootLoader(object):
         if member_types:
             for member in device.devices:
                 if not self._device_type_match(member, member_types):
-                    self.errors.append(_("RAID sets containing the %s must "
+                    self.errors.append(_("RAID sets that contain: %s must "
                                          "have one of the following device "
                                          "types: %s.")
                                        % (desc, ",".join(member_types)))
@@ -412,7 +412,7 @@ class BootLoader(object):
                          desc=""):
         ret = True
         if format_types and device.format.type not in format_types:
-            self.errors.append(_("The %s cannot be of type %s.")
+            self.errors.append(_("%s cannot be of type %s.")
                                % (desc, device.format.type))
             ret = False
 
@@ -539,12 +539,12 @@ class BootLoader(object):
 
         if os.path.exists("/dev/live") and \
            os.path.realpath("/dev/live") == device.path:
-            self.errors.append(_("The live device cannot be used as the %s")
+            self.errors.append(_("%s cannot be on the live device.")
                                % description)
             valid = False
 
         if not self._device_type_match(device, constraint["device_types"]):
-            self.errors.append(_("The %s cannot be of type %s")
+            self.errors.append(_("%s cannot be of type %s.")
                                % (description, device.type))
             valid = False
 
@@ -584,7 +584,7 @@ class BootLoader(object):
             valid = False
 
         if not self.encryption_support and device.encrypted:
-            self.errors.append(_("The %s cannot be on an encrypted block "
+            self.errors.append(_("%s cannot be on an encrypted block "
                                  "device.") % description)
             valid = False
 
@@ -644,7 +644,7 @@ class BootLoader(object):
             return False
 
         if not self._device_type_match(device, self.stage2_device_types):
-            self.errors.append(_("The %s cannot be of type %s")
+            self.errors.append(_("%s cannot be of type %s")
                                % (self.stage2_description, device.type))
             valid = False
 
@@ -682,7 +682,7 @@ class BootLoader(object):
             valid = False
 
         if not self.encryption_support and device.encrypted:
-            self.errors.append(_("The %s cannot be on an encrypted block "
+            self.errors.append(_("%s cannot be on an encrypted block "
                                  "device.") % self.stage2_description)
             valid = False
 
-- 
1.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]