calculate
/
calculate-utils-3-update
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Обновление фраз сообщений

Browse Source
Mike Khiretskiy 9 years ago
parent 0c6b3e495d
commit ac3939f870
4 changed files with 98 additions and 69 deletions
Show Stats Download Patch File Download Diff File

6
pym/builder/utils/cl_builder_prepare.py
Unescape View File

@ -33,9 +33,9 @@ class ClBuilderPrepareAction(Action):
# ошибки, которые отображаются без подробностей
native_error = (DistributiveError, FilesError, BuilderError, GitError)
successMessage = __("Assemble prepared successfully")
failedMessage = __("Preparing the assemble is failed")
interruptMessage = __("Assemble manually interrupted")
successMessage = __("Build prepared successfully")
failedMessage = __("Preparing the build is failed")
interruptMessage = __("Preparing manually interrupted")
# список задач для действия
tasks = [

25
pym/builder/variables/builder.py
Unescape View File

@ -125,8 +125,8 @@ class VariableClBuilderVideodrvSet(Variable):
value = "off"
def init(self):
self.label = _("Fetch video drivers")
self.help = _("fetch video drivers")
self.label = _("Include proprietary video drivers")
self.help = _("include proprietary video drivers")
class VariableClBuilderSourceFilename(Variable):
"""
@ -140,8 +140,8 @@ class VariableClBuilderSourceFilename(Variable):
untrusted = True
def init(self):
self.label = _("Source distribution")
self.help = _("source distribution")
self.label = _("Source image")
self.help = _("source image")
def check(self, isoimage):
"""Set image file"""
@ -206,8 +206,8 @@ class VariableClBuilderDiskDev(Variable):
metavalue = "DEST"
def init(self):
self.label = _("Assemble location")
self.help = _("partition or directory intended for assemble")
self.label = _("Build location")
self.help = _("partition or directory intended for build")
def get(self):
ds = self.Get('cl_builder_device_spool')
@ -251,7 +251,10 @@ class DiskFreeHelper(ReadonlyVariable):
return 0
def humanReadable(self):
return humanreadableSize(int(self.Get()))
value = self.Get()
if not value:
value = "0"
return humanreadableSize(int(value))
class VariableClBuilderDiskSize(DiskFreeHelper):
@ -261,7 +264,7 @@ class VariableClBuilderDiskSize(DiskFreeHelper):
def init(self):
self.label = _("Free disk space")
@is_action(Actions.NewAssemble)
@is_action(Actions.Prepare)
def get(self):
device = self.Get('cl_builder_disk_dev')
if device:
@ -303,12 +306,12 @@ class VariableClBuilderLayeredSet(Variable):
Сборка будет выполняться в слое
"""
type = "bool"
opt = ["--layered"]
opt = ["--layers"]
kernel_opt = "CONFIG_OVERLAY_FS"
def init(self):
self.help = _("use layer for build")
self.label = _("Use layer for build")
self.help = _("use layers for build")
self.label = _("Use layers for build")
def check_kernel_option(self):
"""

12
pym/builder/variables/linux.py
Unescape View File

@ -231,6 +231,18 @@ class VariableOsBuilderLinuxSystem(BuilderLinux):
"""
variable = "os_linux_system"
class VariableOsBuilderLinuxFullname(ReadonlyVariable):
"""
Полное название системы
"""
def get(self):
# TODO: not finished
name = self.Get('os_builder_linux_name')
subname = self.Get('os_builder_linux_subname')
ver = self.Get('os_builder_linux_ver')
build = self.Get('os_builder_linux_build')
arch = self.Get('os_builder_arch_machine')
return ""
class VariableOsBuilderLinuxSubname(BuilderLinux):
"""

124
pym/builder/wsdl_builder.py
Unescape View File

@ -47,10 +47,10 @@ class Wsdl(WsdlBase):
'method_name': "builder_prepare",
# категория метода
'category': __('Builder'),
# заголовок метода
'title': __("Create the system"),
# заголовок метода Подготовить новую сборку
'title': __("Prepare the New Build"),
# иконка для графической консоли
'image': 'calculate-update',
'image': 'starred',
# метод присутствует в графической консоли
'gui': True,
# консольная команда
@ -71,24 +71,35 @@ class Wsdl(WsdlBase):
'cl_dispatch_conf': 'usenew'},
# описание груп (список лямбда функций)
'groups': [
lambda group: group(_("Create the system"),
# Подготовить новую сборку
lambda group: group(_("Prepare the new build"),
# Исходный образ (Source image)
normal=('cl_builder_source_filename',
'cl_builder_new_id',
# Место сборки
# (Build location)
'cl_builder_disk_dev',
# Использовать слои для сборки
# Use layers for build
'cl_builder_layered_set'),
expert=('cl_templates_locate',
# Идентификатор сборки (Build ID)
expert=('cl_builder_new_id',
'cl_templates_locate',
'cl_verbose_set',
'cl_dispatch_conf'),
hide=('cl_templates_locate',
'cl_verbose_set',
'cl_builder_new_id',
'cl_dispatch_conf'),
brief=('os_builder_linux_ver',
'os_builder_linux_system',
brief=('cl_builder_source_filename',
'cl_builder_profile_name',
'cl_builder_disk_dev',
'cl_builder_new_id',
'cl_builder_layered_set',
'cl_builder_disk_size',
'cl_builder_profile_name'),
next_label=_("Perform"))],
),
next_label=_("Next"))],
'brief': {'next': __("Perform"),
'name': __("Create the system")},
'name': __("Prepare the New Build")},
},
{
# идентификатор метода
@ -96,9 +107,9 @@ class Wsdl(WsdlBase):
# категория метода
'category': __('Builder'),
# заголовок метода
'title': __("Break the assemble"),
'title': __("Break the Build"),
# иконка для графической консоли
'image': 'calculate-update',
'image': 'edit-clear',
# метод присутствует в графической консоли
'gui': True,
# консольная команда
@ -118,7 +129,7 @@ class Wsdl(WsdlBase):
'setvars': {'cl_action!': BuilderActions.Break},
# описание груп (список лямбда функций)
'groups': [
lambda group: group(_("Break the assemble"),
lambda group: group(_("Break the Build"),
normal=('cl_builder_prepared_id',
'cl_builder_clear_set'),
expert=('cl_templates_locate',
@ -131,9 +142,9 @@ class Wsdl(WsdlBase):
# категория метода
'category': __('Builder'),
# заголовок метода
'title': __("Update the assemble"),
'title': __("Update the Build"),
# иконка для графической консоли
'image': 'calculate-update',
'image': 'media-playlist-repeat',
# метод присутствует в графической консоли
'gui': True,
# консольная команда
@ -155,26 +166,28 @@ class Wsdl(WsdlBase):
# описание груп (список лямбда функций)
'groups': [
lambda group: group(
_("Update the assemble"),
_("Update the Build"),
normal=('cl_builder_prepared_id',),
expert=(
'update.cl_update_pretend_set',
'update.cl_update_sync_only_set',
'update.cl_update_other_set',
'update.cl_update_pretend_set',
'cl_builder_sync_rep',
'update.cl_update_emergelist_set',
'update.cl_update_world',
'update.cl_update_skip_rb_set',
'update.cl_update_other_set',
'update.cl_update_egencache_force',
'update.cl_update_eixupdate_force',
'update.cl_update_cleanpkg_set',
'update.cl_update_binhost_recheck_set',
'cl_builder_rebuild_changed_set',
'update.cl_update_skip_rb_set',
'update.cl_update_binhost_recheck_set',
'update.cl_update_cleanpkg_set',
'cl_builder_branch_data',
'cl_builder_sync_rep',
'cl_templates_locate',
'cl_verbose_set',
'cl_dispatch_conf'),
next_label=_("Perform"))],
next_label=_("Next"))],
'brief': {'next': __("Perform"),
'name': __("Update the Build")}
},
{
# идентификатор метода
@ -182,9 +195,9 @@ class Wsdl(WsdlBase):
# категория метода
'category': __('Builder'),
# заголовок метода
'title': __("Restore the assemble"),
'title': __("Restore the Build"),
# иконка для графической консоли
'image': 'calculate-update',
'image': 'semi-starred',
# метод присутствует в графической консоли
'gui': True,
# консольная команда
@ -204,7 +217,7 @@ class Wsdl(WsdlBase):
'setvars': {'cl_action!': BuilderActions.Restore},
# описание груп (список лямбда функций)
'groups': [
lambda group: group(_("Break the assemble"),
lambda group: group(_("Break the Build"),
normal=('cl_builder_broken_id',),
expert=('cl_templates_locate',
'cl_verbose_set', 'cl_dispatch_conf'),
@ -216,9 +229,9 @@ class Wsdl(WsdlBase):
# категория метода
'category': __('Builder'),
# заголовок метода
'title': __("Create the image"),
'title': __("Create the Image"),
# иконка для графической консоли
'image': 'calculate-update',
'image': 'media-optical',
# метод присутствует в графической консоли
'gui': True,
# консольная команда
@ -239,27 +252,20 @@ class Wsdl(WsdlBase):
'cl_dispatch_conf': 'usenew'},
# описание груп (список лямбда функций)
'groups': [
lambda group: group(_("Create the image"),
lambda group: group(_("Create the Image"),
normal=('cl_builder_prepared_id',
'cl_builder_image_filename',
'cl_builder_videodrv_set',
'cl_builder_compress',
'cl_builder_isohybrid_set',
'cl_builder_keep_tree_set',
'cl_builder_prelink_set'
),
brief=('cl_builder_kernel_ver',
#'cl_builder_initrd_install',
brief=('cl_builder_prepared_id',
'cl_builder_linux_fullname',
'os_builder_linux_shortname',
'os_builder_linux_build',
'cl_builder_kernel',
'cl_builder_prepared_id',
'cl_builder_image_filename',
'cl_builder_videodrv_set',
'cl_builder_compress',
'cl_builder_isohybrid_set',
'cl_builder_keep_tree_set',
'cl_builder_prelink_set',
'cl_builder_image_filename',
'cl_builder_videodrv_set',
'cl_builder_compress',
'cl_builder_isohybrid_set',
'cl_builder_keep_tree_set',
'cl_builder_prelink_set',
'cl_builder_prepare_free_size',
'cl_builder_image_free_size'
),
@ -267,12 +273,20 @@ class Wsdl(WsdlBase):
'cl_verbose_set',
'cl_dispatch_conf'
),
expert=('cl_templates_locate',
'cl_verbose_set',
'cl_dispatch_conf'),
next_label=_("Perform")),],
expert=(
# Включить проприетарные видео драйвера
# Include proprietary video drivers
'cl_builder_videodrv_set',
'cl_builder_compress',
'cl_builder_keep_tree_set',
'cl_builder_isohybrid_set',
'cl_builder_prelink_set',
'cl_templates_locate',
'cl_verbose_set',
'cl_dispatch_conf'),
next_label=_("Next")),],
'brief': {'next': __("Perform"),
'name': __("Create the image")}
'name': __("Create the Image")}
},
#
# Сменить профиль
@ -283,9 +297,9 @@ class Wsdl(WsdlBase):
# категория метода
'category': __('Builder'),
# заголовок метода
'title': __("Change the Assemble Profile"),
'title': __("Change the Build Profile"),
# иконка для графической консоли
'image': 'extension',
'image': 'applications-puzzles',
# метод присутствует в графической консоли
'gui': True,
# консольная команда
@ -308,8 +322,8 @@ class Wsdl(WsdlBase):
brief=('cl_builder_profile_repo_name',),
hide=('cl_builder_profile_url',
'update.cl_update_profile_sync_set'),
normal=('cl_builder_profile_url',
'cl_builder_prepared_id'),
normal=('cl_builder_prepared_id',
'cl_builder_profile_url',),
expert=('update.cl_update_profile_sync_set',)),
lambda group: group(_("Profile"),
normal=('cl_builder_profile_system_shortname',
@ -325,5 +339,5 @@ class Wsdl(WsdlBase):
'cl_builder_profile_depend_data')
)],
'brief': {'next': __("Perform"),
'name': __("Set the profile")}},
'name': __("Set the Profile")}},
]

Write Preview
Loading…
Cancel
Save