Attachment 6525 Details for Bug 36658

[patch] patch

36658.patch (text/plain), 3.00 KB, created by Florian Best on 2014-12-11 11:08 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2014-12-11 11:08 CET

Size: 3.00 KB

patch

obsolete

>diff --git a/ucs-4.0-0/management/univention-management-console/src/univention/management/console/protocol/session.py b/ucs-4.0-0/management/univention-management-console/src/univention/management/console/protocol/session.py
>index 9240dc5..618dfca 100644
>--- a/ucs-4.0-0/management/univention-management-console/src/univention/management/console/protocol/session.py
>+++ b/ucs-4.0-0/management/univention-management-console/src/univention/management/console/protocol/session.py
>@@ -41,6 +41,7 @@ import sys
> import time
> import json
> import traceback
>+from struct import error as StructError
> 
> import ldap.filter
> 
>@@ -386,6 +387,13 @@ class Processor(signals.Provider):
> 			CORE.warn('Failed to open UDM user object %s: %s' % (self.__user_dn, e))
> 		return None
> 
>+	def _translate(self, message, translationId):
>+		try:
>+			return self.i18n._(message, translationId)
>+		except StructError:
>+			CORE.error('Corrupted .mo file detected for translation domain %r' % (translationId,))
>+			return message
>+
> 	def handle_request_get(self, msg):
> 		"""Handles a GET request. The following possible variants are supported:
> 
>@@ -442,12 +450,12 @@ class Processor(signals.Provider):
> 						modules.append({
> 							'id': id,
> 							'flavor': flavor.id,
>-							'name': self.i18n._(flavor.name, translationId),
>-							'description': self.i18n._(flavor.description, translationId),
>+							'name': self._translate(flavor.name, translationId),
>+							'description': self._translate(flavor.description, translationId),
> 							'icon': flavor.icon,
> 							'categories': (flavor.categories or module.categories) + favcat,
> 							'priority': flavor.priority,
>-							'keywords': list(set(flavor.keywords + [self.i18n._(keyword, translationId) for keyword in flavor.keywords]))
>+							'keywords': list(set(flavor.keywords + [self._translate(keyword, translationId) for keyword in flavor.keywords]))
> 						})
> 				else:
> 					favcat = []
>@@ -455,12 +463,12 @@ class Processor(signals.Provider):
> 						favcat.append('_favorites_')
> 					modules.append({
> 						'id': id,
>-						'name': self.i18n._(module.name, id),
>-						'description': self.i18n._(module.description, id),
>+						'name': self._translate(module.name, id),
>+						'description': self._translate(module.description, id),
> 						'icon': module.icon,
> 						'categories': module.categories + favcat,
> 						'priority': module.priority,
>-						'keywords': list(set(module.keywords + [self.i18n._(keyword, id) for keyword in module.keywords]))
>+						'keywords': list(set(module.keywords + [self._translate(keyword, id) for keyword in module.keywords]))
> 					})
> 			res.body['modules'] = modules
> 			CORE.info('Modules: %s' % (modules,))
>@@ -475,7 +483,7 @@ class Processor(signals.Provider):
> 					'id': catID,
> 					'icon': category.icon,
> 					'color': category.color,
>-					'name': self.i18n._(category.name, category.domain).format(**_ucr_dict),
>+					'name': self._translate(category.name, category.domain).format(**_ucr_dict),
> 					'priority': category.priority
> 				})
> 			res.body['categories'] = categories

Actions: View | Diff

Attachments on bug 36658: 6525