From 39a6058b8978375fe40c0fefaacd53163d40b338 Mon Sep 17 00:00:00 2001
From: Vinicius Moreira <vinicius_fmoreira@hotmail.com>
Date: Tue, 1 Oct 2019 11:40:10 -0300
Subject: [PATCH] refactoring AUR desktop entries

---
 aur/panel_entry.py | 24 +++++++-----------------
 aur/tray_entry.py  | 25 +++++++------------------
 2 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/aur/panel_entry.py b/aur/panel_entry.py
index 54cbca25..9e488211 100644
--- a/aur/panel_entry.py
+++ b/aur/panel_entry.py
@@ -1,24 +1,15 @@
 # Generates a .desktop file based on the current python version. Used for AUR installation
 import os
 import sys
-import locale
-
-system_locale = locale.getdefaultlocale()
-system_locale = system_locale[0].split('_')[0] if system_locale and isinstance(system_locale, list) else 'en'
-
-if system_locale == 'pt':
-    comment = "Gerencie seus aplicativos Flatpak / Snap / AUR "
-elif system_locale == 'es':
-    comment = "Administre sus aplicaciones Flatpak / Snap / AUR"
-else:
-    comment = "Manage your Flatpak / Snap / AUR applications"
 
 desktop_file = """
 [Desktop Entry]
-Type = Application
-Name = bauh
-Categories = System;
-Comment = {comment}
+Type=Application
+Name=bauh
+Categories=System;
+Comment=Manage your Flatpak / Snap / AUR applications
+Comment[pt]=Gerencie seus aplicativos Flatpak / Snap / AUR
+Comment[es]=Administre sus aplicaciones Flatpak / Snap / AUR
 Exec = {path}
 Icon = {lib_path}/python{version}/site-packages/bauh/view/resources/img/logo.svg
 """
@@ -30,5 +21,4 @@ app_cmd = os.getenv('BAUH_PATH', '/usr/bin/bauh')
 with open('bauh.desktop', 'w+') as f:
     f.write(desktop_file.format(lib_path=os.getenv('BAUH_LIB_PATH', '/usr/lib'),
                                 version=py_version,
-                                path=app_cmd,
-                                comment=comment))
+                                path=app_cmd))
diff --git a/aur/tray_entry.py b/aur/tray_entry.py
index 792409ba..8e48c4d0 100644
--- a/aur/tray_entry.py
+++ b/aur/tray_entry.py
@@ -1,27 +1,18 @@
 # Generates a .desktop file based on the current python version. Used for AUR installation
-import locale
 import os
 import sys
 
-system_locale = locale.getdefaultlocale()
-system_locale = system_locale[0].split('_')[0] if system_locale and isinstance(system_locale, list) else 'en'
-
-if system_locale == 'pt':
-    comment = "Gerencie seus aplicativos Flatpak / Snap / AUR "
-    tray = 'bandeja'
-elif system_locale == 'es':
-    comment = "Administre sus aplicativos Flatpak / Snap / AUR"
-    tray = 'bandeja'
-else:
-    comment = "Manage your Flatpak / Snap / AUR applications"
-    tray = 'tray'
 
 desktop_file = """
 [Desktop Entry]
 Type = Application
-Name = bauh ( {tray} )
+Name = bauh ( tray )
+Name[pt] = bauh ( bandeja )
+Name[es] = bauh ( bandeja )
 Categories = System;
-Comment = {comment}
+Comment=Manage your Flatpak / Snap / AUR applications
+Comment[pt]=Gerencie seus aplicativos Flatpak / Snap / AUR
+Comment[es]=Administre sus aplicaciones Flatpak / Snap / AUR
 Exec = {path}
 Icon = {lib_path}/python{version}/site-packages/bauh/view/resources/img/logo.svg
 """
@@ -33,9 +24,7 @@ app_cmd = os.getenv('BAUH_PATH', '/usr/bin/bauh') + ' --tray=1'
 with open('bauh_tray.desktop', 'w+') as f:
     f.write(desktop_file.format(lib_path=os.getenv('BAUH_LIB_PATH', '/usr/lib'),
                                 version=py_version,
-                                path=app_cmd,
-                                comment=comment,
-                                tray=tray))
+                                path=app_cmd))
 
 
 with open('bauh-tray', 'w') as f: