From 828a16f235b761aa6029c42ac54e75e64e240304 Mon Sep 17 00:00:00 2001
From: Antonio de la Rosa <antonio.delarosa@salirdelhoyo.com>
Date: Fri, 21 Mar 2025 18:39:38 +0100
Subject: [PATCH] Added more fixes in language

---
 paramecio/libraries/generate_admin_class.py   |   2 +-
 .../languages/en-US/LC_MESSAGES/libraries.mo  | Bin 0 -> 686 bytes
 .../languages/en-US/LC_MESSAGES/libraries.po  |  61 ++++++++++++++++++
 .../languages/es-ES/LC_MESSAGES/libraries.mo  | Bin 0 -> 711 bytes
 .../languages/es-ES/LC_MESSAGES/libraries.po  |  61 ++++++++++++++++++
 paramecio/libraries/languages/libraries.pot   |  60 +++++++++++++++++
 paramecio/libraries/mtemplates.py             |   6 ++
 .../libraries/templates/utils/admin.phtml     |   2 +-
 .../libraries/templates/utils/list.phtml      |  17 ++++-
 paramecio/modules/admin2/models/admin.py      |   8 ++-
 10 files changed, 209 insertions(+), 8 deletions(-)
 create mode 100644 paramecio/libraries/languages/en-US/LC_MESSAGES/libraries.mo
 create mode 100644 paramecio/libraries/languages/en-US/LC_MESSAGES/libraries.po
 create mode 100644 paramecio/libraries/languages/es-ES/LC_MESSAGES/libraries.mo
 create mode 100644 paramecio/libraries/languages/es-ES/LC_MESSAGES/libraries.po
 create mode 100644 paramecio/libraries/languages/libraries.pot

diff --git a/paramecio/libraries/generate_admin_class.py b/paramecio/libraries/generate_admin_class.py
index 8c67357..d2b3f14 100644
--- a/paramecio/libraries/generate_admin_class.py
+++ b/paramecio/libraries/generate_admin_class.py
@@ -170,7 +170,7 @@ class GenerateAdminClass:
                 return self.t.render_template(self.template_verify_delete, url=self.url, item_id=getpostfiles.get['id'], op_admin=3, verified=1)
     
         else:
-            return self.t.render_template(self.template_admin, admin=self)
+            return self.t.render_template(self.template_admin, admin=self, add_new_item=_('Add new item'))
 
     """
     def show_config(self):
diff --git a/paramecio/libraries/languages/en-US/LC_MESSAGES/libraries.mo b/paramecio/libraries/languages/en-US/LC_MESSAGES/libraries.mo
new file mode 100644
index 0000000000000000000000000000000000000000..14ba26e4ac3c38859750de7b7244a65c932edaf0
GIT binary patch
literal 686
zcmb`D&u-K(5Qhzve*p=~8CAY;0l6ewR$78UDs&5#cGXokMI4ZjNv5gGt{vG<3nwmI
zIC4PTcp{#G=itb1vXROIFw*$59nUw8f8SaAE)X}6caagfj{Jq>xP3v0o8UTl1>6AF
zz<c0z@P5C3)blZT75mS?%iu1^brbLwI0yfLCCJ{l7gyg6$leBIZ`-dw_xu8~_bbTW
zZy<Yrfb9JVLfOSNjQl?wT$6OOmA{{gOPHXfbFqhecClSm($bkUk(OeI78FU0D-*k6
zwfo8~NlbKzV!w&T*&t@RrXc2|eR(Vj9X`m=mL-L7)Gox#yAvv-+N;!S@&N_8Ob)1V
zKB{S`O{Jc<bx?)F_H17r(5c}=YDY)P<scmlRl21HnaoCcHhhp~X_|0%Rd{W~LPzIO
zInlOmaSc_FUjDPrCE0g}^JKa=9iR8lHq+#Vvym(`pBnUu^f5kc7TVY+vOLy4P<(n=
s?5ffEIc|4EUX5+(Dr4(hj^3M?yiqU7l3(3p<_M1^w>F1~`2SD&7d?`b`Tzg`

literal 0
HcmV?d00001

diff --git a/paramecio/libraries/languages/en-US/LC_MESSAGES/libraries.po b/paramecio/libraries/languages/en-US/LC_MESSAGES/libraries.po
new file mode 100644
index 0000000..9ddb6bc
--- /dev/null
+++ b/paramecio/libraries/languages/en-US/LC_MESSAGES/libraries.po
@@ -0,0 +1,61 @@
+# Translations for libraries
+# Copyright (C) 2025
+# This file is distributed under the same license as the Paramecio package.
+# Antonio de la Rosa <antonio.delarosa@salirdelhoyo.com>, 2025.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-03-21 18:11+0100\n"
+"PO-Revision-Date: 2025-03-21 18:15+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.5\n"
+
+#: templates/utils/list.phtml:25
+msgid "Search"
+msgstr "Search"
+
+#: templates/utils/list.phtml:144 lists.py:317
+msgid "Pages"
+msgstr "Pages"
+
+#: lists.py:83
+msgid "Options"
+msgstr "Options"
+
+#: lists.py:174 generate_admin_class.py:239
+msgid "Edit"
+msgstr "Edit"
+
+#: lists.py:175
+msgid "Delete"
+msgstr "Delete"
+
+#: pages.py:71
+msgid "Last"
+msgstr "Last"
+
+#: generate_admin_class.py:60 generate_admin_class.py:225
+msgid "Home"
+msgstr "Home"
+
+#: generate_admin_class.py:87 generate_admin_class.py:127
+#: generate_admin_class.py:173
+msgid "Add new item"
+msgstr "Add new item"
+
+#: generate_admin_class.py:93 generate_admin_class.py:132
+msgid "Edit item"
+msgstr "Edit item"
+
+#: generate_admin_class.py:139 generate_admin_class.py:165
+#: generate_admin_class.py:264
+msgid "Task successful"
+msgstr "Task successful"
diff --git a/paramecio/libraries/languages/es-ES/LC_MESSAGES/libraries.mo b/paramecio/libraries/languages/es-ES/LC_MESSAGES/libraries.mo
new file mode 100644
index 0000000000000000000000000000000000000000..4d675405f557ea74c4d91786d4c34293c6522cce
GIT binary patch
literal 711
zcmYk2&2AGh5XTLauLT6<zzHE=xPV+XX(NS2AT>0FNQoLX3*vx;%<gn+*tH|uTM9QG
zfddla1V@f=<D4tcz;kfq@6C!Z()j23@{H&A)wPcdashfB>Y?k<U(g^|PB3;6TnEp9
zH^4RUCU_pa)!JJv?}BIHe*m5acfn9M1}}p%@DG@Q*TCl|mvPtf9T@W7xAq4xy!Qz_
z2YzY!t&RTxFTwv4#FLGLyzrkOp*Cu6%emVtJB15Mni<1<;V+GB=Q-E(hAU4M+o6&?
zv0<)!b1c1&O+{=hoo9P<uZ(tVDhqOKM$%@7ES2sxcXgJLa|d<Frq;Zo%!^Sjo|1Ja
zNO-hQb7Q@jxI*P(P!~?52JY#e*ry{ElEjYml<;oc?TL6(bUVD$PddHZaVL(W&|Rcf
zYFA2cEGoxR7d6HZDaq<TJK^MB3}?|~G#Re?cQ)eaq0yc+o_RY*A5X{r&b*XL-{aY#
zw2u7!C+V)}uku2>1F~YMGm|S_B)tDp`RJK=M4Ie!j;SFmi*Ii9BDTHwE^}qMuIb2d
ztg=Eo!v@A$X`6li!zwz`DpQ6nK9^oq1{;Q@vE1q6YoWAsY*4!lb*Z!@IUOr+oMe9i
Dx0j&&

literal 0
HcmV?d00001

diff --git a/paramecio/libraries/languages/es-ES/LC_MESSAGES/libraries.po b/paramecio/libraries/languages/es-ES/LC_MESSAGES/libraries.po
new file mode 100644
index 0000000..296a6cd
--- /dev/null
+++ b/paramecio/libraries/languages/es-ES/LC_MESSAGES/libraries.po
@@ -0,0 +1,61 @@
+# Translations for libraries
+# Copyright (C) 2025
+# This file is distributed under the same license as the Paramecio package.
+# Antonio de la Rosa <antonio.delarosa@salirdelhoyo.com>, 2025.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-03-21 18:11+0100\n"
+"PO-Revision-Date: 2025-03-21 18:15+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: es_ES\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.5\n"
+
+#: templates/utils/list.phtml:25
+msgid "Search"
+msgstr "Buscar"
+
+#: templates/utils/list.phtml:144 lists.py:317
+msgid "Pages"
+msgstr "Páginas"
+
+#: lists.py:83
+msgid "Options"
+msgstr "Opciones"
+
+#: lists.py:174 generate_admin_class.py:239
+msgid "Edit"
+msgstr "Editar"
+
+#: lists.py:175
+msgid "Delete"
+msgstr "Borrar"
+
+#: pages.py:71
+msgid "Last"
+msgstr "Último"
+
+#: generate_admin_class.py:60 generate_admin_class.py:225
+msgid "Home"
+msgstr "Inicio"
+
+#: generate_admin_class.py:87 generate_admin_class.py:127
+#: generate_admin_class.py:173
+msgid "Add new item"
+msgstr "Añadir nuevo elemento"
+
+#: generate_admin_class.py:93 generate_admin_class.py:132
+msgid "Edit item"
+msgstr "Editar elemento"
+
+#: generate_admin_class.py:139 generate_admin_class.py:165
+#: generate_admin_class.py:264
+msgid "Task successful"
+msgstr "Tarea exitosa"
diff --git a/paramecio/libraries/languages/libraries.pot b/paramecio/libraries/languages/libraries.pot
new file mode 100644
index 0000000..ab99444
--- /dev/null
+++ b/paramecio/libraries/languages/libraries.pot
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-03-21 18:11+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/utils/list.phtml:25
+msgid "Search"
+msgstr ""
+
+#: templates/utils/list.phtml:144 lists.py:317
+msgid "Pages"
+msgstr ""
+
+#: lists.py:83
+msgid "Options"
+msgstr ""
+
+#: lists.py:174 generate_admin_class.py:239
+msgid "Edit"
+msgstr ""
+
+#: lists.py:175
+msgid "Delete"
+msgstr ""
+
+#: pages.py:71
+msgid "Last"
+msgstr ""
+
+#: generate_admin_class.py:60 generate_admin_class.py:225
+msgid "Home"
+msgstr ""
+
+#: generate_admin_class.py:87 generate_admin_class.py:127
+#: generate_admin_class.py:173
+msgid "Add new item"
+msgstr ""
+
+#: generate_admin_class.py:93 generate_admin_class.py:132
+msgid "Edit item"
+msgstr ""
+
+#: generate_admin_class.py:139 generate_admin_class.py:165
+#: generate_admin_class.py:264
+msgid "Task successful"
+msgstr ""
diff --git a/paramecio/libraries/mtemplates.py b/paramecio/libraries/mtemplates.py
index 98e2040..8f60df7 100644
--- a/paramecio/libraries/mtemplates.py
+++ b/paramecio/libraries/mtemplates.py
@@ -94,6 +94,10 @@ def url_for(name, **kwargs):
     
     return app.get_url(name, **kwargs)
 
+def get_file():
+    
+    return __file__
+
 class PTemplate:
     """A class used how shortcuts for Mako template functions.
     """
@@ -212,6 +216,8 @@ class PTemplate:
         #print(self.url_for)
         
         self.add_filter(url_for)
+        
+        self.add_filter(get_file)
 
     def _(self, text):
     
diff --git a/paramecio/libraries/templates/utils/admin.phtml b/paramecio/libraries/templates/utils/admin.phtml
index f5d2666..16bc5db 100644
--- a/paramecio/libraries/templates/utils/admin.phtml
+++ b/paramecio/libraries/templates/utils/admin.phtml
@@ -1,4 +1,4 @@
 ${show_flash_message()|n}
 <!--<h1>${admin.title}</h1>-->
-<p><a href="${add_get_parameters(admin.url, op_admin='1')}">${lang('common', 'add_item', 'Add new item')}</a></p>
+<p><a href="${add_get_parameters(admin.url, op_admin='1')}">${add_new_item}</a></p>
 ${admin.list.show()|n}
diff --git a/paramecio/libraries/templates/utils/list.phtml b/paramecio/libraries/templates/utils/list.phtml
index b843cbc..0e90aa6 100644
--- a/paramecio/libraries/templates/utils/list.phtml
+++ b/paramecio/libraries/templates/utils/list.phtml
@@ -1,3 +1,14 @@
+<%
+
+# Load lang gettext
+
+from paramecio.libraries.i18n import I18n, PGetText
+
+gtext=PGetText(get_file())
+
+_=gtext.gettext
+
+%>
 <%def name="select_field(field)">
     % if simplelist.search_field==field:
         selected \
@@ -11,13 +22,13 @@
 % if simplelist.yes_search:
 <div class="form">
 <form method="get" action="${simplelist.url}">
-    ${lang('common','search', 'Search')}: <input type="text" name="search_text" value="${simplelist.search_text|n}"> 
+    ${_('Search')}: <input type="text" name="search_text" value="${simplelist.search_text|n}"> 
     <select name="search_field">
     % for field in simplelist.search_fields:
         <option value="${simplelist.model.fields[field].name}" ${select_field(field)}>${simplelist.model.fields[field].label}</option>
     % endfor 
     </select>
-    <input type="submit" value="${lang('common', 'search', 'Search')}" />
+    <input type="submit" value="${_('Search')}" />
 </form>
 </div>
 % endif
@@ -130,6 +141,6 @@ size_td=round(100/(len(simplelist.fields_showed)+len(simplelist.arr_extra_option
 % endif
 <p>
 % if pages!='':
-${lang('common', 'pages', 'Pages')}: ${pages|n}
+${_('Pages')}: ${pages|n}
 % endif
 </p>
diff --git a/paramecio/modules/admin2/models/admin.py b/paramecio/modules/admin2/models/admin.py
index 3d43e73..1993ed6 100644
--- a/paramecio/modules/admin2/models/admin.py
+++ b/paramecio/modules/admin2/models/admin.py
@@ -25,11 +25,11 @@ class PrivilegesField2(corefields.IntegerField):
         value=int(value)
         
         if value==0:
-            return I18n.lang('admin', 'without_privileges', 'Without privileges')
+            return _('Without privileges')
         elif value==1:
-            return I18n.lang('admin', 'selected_privileges', 'Selected privileges')
+            return _('Selected privileges')
         elif value==2:
-            return I18n.lang('admin', 'administrator', 'Administrator')
+            return _('Administrator')
 
 class UserAdmin2(UserModel):
     
@@ -44,6 +44,8 @@ class UserAdmin2(UserModel):
         
         self.fields['username'].required=True
         
+        self.fields['username'].label=_('Username')
+        
         self.register(PasswordField('password'))
 
         self.fields['password'].required=True