Attachment 10636 Details for Bug 52878 – patch (git:fbest/52878-unidecode-umlauts)

[patch] patch (git:fbest/52878-unidecode-umlauts)

52878.patch (text/plain), 3.11 KB, created by Florian Best on 2021-03-09 10:53:07 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2021-03-09 10:53:07 CET

Size: 3.11 KB

patch

obsolete

>commit a3cbbd107463a84af9fb183f4dc7b0e82d2ce2ab
>Author: Florian Best <best@univention.de>
>Date:   Tue Mar 9 10:52:20 2021 +0100
>
>    Bug #52878: use unidecode for umlaut replacement
>
>diff --git management/univention-directory-manager-modules/debian/control management/univention-directory-manager-modules/debian/control
>index 28b1fd538f..ed1bc31d9f 100644
>--- management/univention-directory-manager-modules/debian/control
>+++ management/univention-directory-manager-modules/debian/control
>@@ -27,6 +27,7 @@ Depends:
>  python-pyasn1-modules,
>  python-six,
>  python-smbpasswd,
>+ python-unidecode,
>  python-univention (>= 12.0.1-1),
>  python-univention-directory-manager-cli (= ${binary:Version}),
>  python-univention-heimdal (>= 4.0.1-1),
>@@ -86,6 +87,7 @@ Depends:
>  python3-pyasn1-modules,
>  python3-six,
>  python3-smbpasswd,
>+ python3-unidecode,
>  python3-univention (>= 10.0.4-2),
>  python3-univention-directory-manager-cli (= ${binary:Version}),
>  python3-univention-heimdal (>= 4.0.1-1),
>diff --git management/univention-directory-manager-modules/modules/univention/admin/__init__.py management/univention-directory-manager-modules/modules/univention/admin/__init__.py
>index 7d23c67f61..62df0f9bf4 100644
>--- management/univention-directory-manager-modules/modules/univention/admin/__init__.py
>+++ management/univention-directory-manager-modules/modules/univention/admin/__init__.py
>@@ -39,6 +39,7 @@ import unicodedata
> 
> import six
> from ldap.filter import filter_format
>+import unidecode
> 
> import univention.config_registry
> import univention.debug as ud
>@@ -133,9 +134,7 @@ def pattern_replace(pattern, object):
> 			elif iCmd == 'umlauts':
> 				if isinstance(text, bytes):
> 					text = text.decode('UTF-8')
>-				for umlaut, code in property.UMLAUTS.items():
>-					text = text.replace(umlaut, code)
>-
>+				text = unidecode.unidecode(text)
> 				text = unicodedata.normalize('NFKD', text).encode('ascii', 'ignore').decode('ascii')
> 			elif iCmd == 'alphanum':
> 				whitelist = configRegistry.get('directory/manager/templates/alphanum/whitelist', '')
>@@ -191,70 +190,6 @@ def pattern_replace(pattern, object):
> 
> 
> class property:
>-	UMLAUTS = {
>-		u'Ã': u'A',
>-		u'Ã': u'A',
>-		u'Ã': u'A',
>-		u'Ã': u'A',
>-		u'Ã': u'Ae',
>-		u'Ã': u'A',
>-		u'Ã': u'AE',
>-		u'Ã': u'C',
>-		u'Ã': u'E',
>-		u'Ã': u'E',
>-		u'Ã': u'E',
>-		u'Ã': u'E',
>-		u'Ã': u'I',
>-		u'Ã': u'I',
>-		u'Ã': u'I',
>-		u'Ã': u'I',
>-		u'Ã': u'D',
>-		u'Ã': u'N',
>-		u'Ã': u'O',
>-		u'Ã': u'O',
>-		u'Ã': u'O',
>-		u'Ã': u'O',
>-		u'Ã': u'Oe',
>-		u'Ã': u'O',
>-		u'Ã': u'U',
>-		u'Ã': u'U',
>-		u'Ã': u'U',
>-		u'Ã': u'Ue',
>-		u'Ã': u'Y',
>-		u'Ã': u'P',
>-		u'Ã': u'ss',
>-		u'Ã ': u'a',
>-		u'Ã¡': u'a',
>-		u'Ã¢': u'a',
>-		u'Ã£': u'a',
>-		u'Ã¤': u'ae',
>-		u'Ã¥': u'a',
>-		u'Ã¦': u'ae',
>-		u'Ã§': u'c',
>-		u'Ã¨': u'e',
>-		u'Ã©': u'e',
>-		u'Ãª': u'e',
>-		u'Ã«': u'e',
>-		u'Ã¬': u'i',
>-		u'Ã': u'i',
>-		u'Ã®': u'i',
>-		u'Ã¯': u'i',
>-		u'Ã°': u'o',
>-		u'Ã±': u'n',
>-		u'Ã²': u'o',
>-		u'Ã³': u'o',
>-		u'Ã´': u'o',
>-		u'Ãµ': u'o',
>-		u'Ã¶': u'oe',
>-		u'Ã¸': u'o',
>-		u'Ã¹': u'u',
>-		u'Ãº': u'u',
>-		u'Ã»': u'u',
>-		u'Ã¼': u'ue',
>-		u'Ã½': u'y',
>-		u'Ã¾': u'p',
>-		u'Ã¿': u'y'
>-	}
> 
> 	def __init__(
> 		self,

Actions: View | Diff

Attachments on bug 52878: 10636