Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon into main

translations/ar.json

@@ -384,5 +384,8 @@
     "laughing": "يضحك",
     "gender": "جنس تذكير أو تأنيث",
     "He/Him": "هو",
-    "She/Her": "هي"
+    "She/Her": "هي",
+    "girl": "فتاة",
+    "boy": "صبي",
+    "pronoun": "ضمير"
 }

translations/ca.json

@@ -384,5 +384,8 @@
     "laughing": "rient",
     "gender": "gènere",
     "He/Him": "Ell",
-    "She/Her": "Ella"
+    "She/Her": "Ella",
+    "girl": "noia",
+    "boy": "noi",
+    "pronoun": "pronom"
 }

translations/cy.json

@@ -384,5 +384,8 @@
     "laughing": "chwerthin",
     "gender": "rhyw",
     "He/Him": "Ef",
-    "She/Her": "Hi/Ei"
+    "She/Her": "Hi/Ei",
+    "girl": "merch",
+    "boy": "bachgen",
+    "pronoun": "rhagenw"
 }

translations/de.json

@@ -384,5 +384,8 @@
     "laughing": "Lachen",
     "gender": "geschlecht",
     "He/Him": "Er/ihm",
-    "She/Her": "Sie"
+    "She/Her": "Sie",
+    "girl": "mädchen",
+    "boy": "junge",
+    "pronoun": "pronomen"
 }

translations/en.json

@@ -384,5 +384,8 @@
     "laughing": "laughing",
     "gender": "gender",
     "He/Him": "He/Him",
-    "She/Her": "She/Her"
+    "She/Her": "She/Her",
+    "girl": "girl",
+    "boy": "boy",
+    "pronoun": "pronoun"
 }

translations/es.json

@@ -384,5 +384,8 @@
     "laughing": "risa",
     "gender": "género",
     "He/Him": "El",
-    "She/Her": "Ella"
+    "She/Her": "Ella",
+    "girl": "muchacha",
+    "boy": "niño",
+    "pronoun": "pronombre"
 }

translations/fr.json

@@ -384,5 +384,8 @@
     "laughing": "en riant",
     "gender": "le genre",
     "He/Him": "Il/Lui",
-    "She/Her": "Elle"
+    "She/Her": "Elle",
+    "girl": "fille",
+    "boy": "garçon",
+    "pronoun": "pronom"
 }

translations/ga.json

@@ -384,5 +384,8 @@
     "laughing": "ag gáire",
     "gender": "inscne",
     "He/Him": "Sé/Eisean",
-    "She/Her": "Sí"
+    "She/Her": "Sí",
+    "girl": "cailín",
+    "boy": "buachaill",
+    "pronoun": "forainm"
 }

translations/hi.json

@@ -384,5 +384,8 @@
     "laughing": "हस रहा",
     "gender": "लिंग",
     "He/Him": "वह/उसे",
-    "She/Her": "वह/उसकी"
+    "She/Her": "वह/उसकी",
+    "girl": "लड़की",
+    "boy": "लड़का",
+    "pronoun": "सवर्नाम"
 }

translations/it.json

@@ -384,5 +384,8 @@
     "laughing": "ridendo",
     "gender": "genere",
     "He/Him": "Lui",
-    "She/Her": "Lei"
+    "She/Her": "Lei",
+    "girl": "ragazza",
+    "boy": "ragazzo",
+    "pronoun": "pronome"
 }

translations/ja.json

@@ -384,5 +384,8 @@
     "laughing": "笑い",
     "gender": "性別",
     "He/Him": "彼",
-    "She/Her": "彼女"
+    "She/Her": "彼女",
+    "girl": "女の子",
+    "boy": "男の子",
+    "pronoun": "代名詞"
 }

translations/oc.json

@@ -380,5 +380,8 @@
     "laughing": "laughing",
     "gender": "gender",
     "He/Him": "He/Him",
-    "She/Her": "She/Her"
+    "She/Her": "She/Her",
+    "girl": "girl",
+    "boy": "boy",
+    "pronoun": "pronoun"
 }

translations/pt.json

@@ -384,5 +384,8 @@
     "laughing": "rindo",
     "gender": "gênero",
     "He/Him": "Ele",
-    "She/Her": "Ela"
+    "She/Her": "Ela",
+    "girl": "garota",
+    "boy": "garoto",
+    "pronoun": "pronome"
 }

translations/ru.json

@@ -384,5 +384,8 @@
     "laughing": "смеющийся",
     "gender": "Пол",
     "He/Him": "Он/Его",
-    "She/Her": "Она/Ее"
+    "She/Her": "Она/Ее",
+    "girl": "девочка",
+    "boy": "мальчик",
+    "pronoun": "местоимение"
 }

translations/zh.json

@@ -384,5 +384,8 @@
     "laughing": "笑",
     "gender": "性别",
     "He/Him": "他",
-    "She/Her": "她"
+    "She/Her": "她",
+    "girl": "女孩",
+    "boy": "男生",
+    "pronoun": "代词"
 }

utils.py

@@ -678,6 +678,7 @@ def getGenderFromBio(baseDir: str, actor: str, personCache: {},
     if not personCache.get(actor):
         return None
     bioFound = None
+    pronounStr = translate['pronoun'].lower()
     if personCache[actor].get('actor'):
         # is gender defined as a profile tag?
         if personCache[actor]['actor'].get('attachment'):
@@ -692,6 +693,9 @@ def getGenderFromBio(baseDir: str, actor: str, personCache: {},
                        translate['gender'].lower():
                         bioFound = tag['value']
                         break
+                    elif tag['name'].lower().startswith(pronounStr):
+                        bioFound = tag['value']
+                        break
         # if not then use the bio
         if not bioFound and personCache[actor]['actor'].get('summary'):
             bioFound = personCache[actor]['actor']['summary']
@@ -715,6 +719,9 @@ def getGenderFromBio(baseDir: str, actor: str, personCache: {},
                                translate['gender'].lower():
                                 bioFound = tag['value']
                                 break
+                            elif tag['name'].lower().startswith(pronounStr):
+                                bioFound = tag['value']
+                                break
                 # if not then use the bio
                 if not bioFound and actorJson.get('summary'):
                     bioFound = actorJson['summary']
@@ -723,9 +730,11 @@ def getGenderFromBio(baseDir: str, actor: str, personCache: {},
     gender = 'They/Them'
     bioFoundOrig = bioFound
     bioFound = bioFound.lower()
-    if translate['He/Him'] in bioFound:
+    if translate['He/Him'].lower() in bioFound or \
+       translate['boy'].lower() in bioFound:
         gender = 'He/Him'
-    elif translate['She/Her'] in bioFound:
+    elif (translate['She/Her'].lower() in bioFound or
+          translate['girl'].lower() in bioFound):
         gender = 'She/Her'
     elif 'him' in bioFound or 'male' in bioFound:
         gender = 'He/Him'