Minor refactors.

Author: theriftlab

README.md

@@ -17,6 +17,16 @@ Simply pass in a date and coordinates to one of the available chart classes, and
 
 Full documentation is available [here](https://github.com/theriftlab/immanuel-python/tree/v1.2.4/docs/0-contents.md), or follow the Quick Start below to see how to quickly generate a natal chart.
 
+## Translations
+
+Immanuel is currently available in the following locales / languages:
+
+* **en_US:** (default) US English
+* **pt_BR:** Brazilian Portuguese
+* Coming soon: Spanish translation
+
+See [the documentation](/docs/5-settings.md#locale) on how to switch. Documentation itself is not currently available in other translations.
+
 ## Quick Start
 
 You can get started with full natal chart data in minutes. Simply install Immanuel:
@@ -134,7 +144,13 @@ Which will output each of the chart's objects in this format:
     },
     "sign": {
         "number": 10,
-        "name": "Capricorn"
+        "name": "Capricorn",
+        "element": "Earth",
+        "modality": "Cardinal"
+    },
+    "decan": {
+        "number": 2,
+        "name": "2nd Decan"
     },
     "house": {
         "index": 2000011,
@@ -251,6 +267,8 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 
 Immanuel is forever indebted to the pioneering work of Alois Treindl and Dieter Koch at Astrodienst, and to João Ventura for the incredibly detailed [flatlib](https://github.com/flatangle/flatlib) which first inspired the development of this package.
 
+A big thank-you goes to Nathan Octavio who suggested translations, and who translated Immanuel into Brazilian Portuguese.
+
 ## Contact
 
 Please post any issues, feature requests, PRs etc. on GitHub. For anything else email robert@theriftlab.com.

docs/5-settings.md

@@ -72,6 +72,14 @@ settings.aspect_rules |= {
 
 There are many detailed customizations for chart data, especially for aspect rules. This section will provide you with an overview, but taking a look through the defaults in `setup.py` and the const files will give you a more detailed idea.
 
+### `locale`
+
+A string specifying the locale for all output on any subsequently-generated charts or chart subjects. Available options:
+
+* `pt_BR` - Brazilian Portuguese
+
+Default: `None` (effectively `en_US`)
+
 ### `chart_data`
 
 A dict which specifies what top-level data each chart type should contain. The values here are fairly self-explanatory as the constants line up with the chart class property names described in the [Returned Data](4-data.md) section.

immanuel/classes/localize.py

@@ -34,13 +34,20 @@ def set_locale(lcid: str) -> None:
             Localize.lcid = lcid
             Localize.translation = translation
             locale.setlocale(locale.LC_TIME, lcid)
+
+            mappings_path = f'{Localize.localedir}{os.sep}{Localize.lcid}{os.sep}mappings.py'
+
+            if os.path.isfile(mappings_path):
+                with open(mappings_path, 'r') as mappings:
+                    exec(mappings.read(), MAPPINGS)
         else:
             Localize.reset()
 
     def reset() -> None:
         Localize.lcid = None
         Localize.translation = None
         locale.setlocale(locale.LC_TIME, 'en_US')
+        MAPPINGS = {}
 
 
 def _(input: str, context: str = None) -> str:
@@ -58,8 +65,4 @@ def gender(index: int|float) -> str:
     if Localize.translation is None:
         return None
 
-    if not MAPPINGS:
-        with open(f'{Localize.localedir}{os.sep}{Localize.lcid}{os.sep}mappings.py', 'r') as mappings:
-            exec(mappings.read(), MAPPINGS)
-
     return MAPPINGS['GENDERS'][index] if index in MAPPINGS['GENDERS'] else genders.AMBIGUOUS

immanuel/classes/wrap.py

@@ -226,20 +226,20 @@ def __init__(self, object: dict, objects: dict = None, houses: dict = None, is_d
             self.score = dignity.score(dignity_state)
 
     def __str__(self) -> str:
-        if hasattr(self, 'house'):
-            return _('{name} {longitude} in {sign}, {house}').format(
-                    name=self.name,
-                    longitude=self.sign_longitude,
-                    sign=self.sign,
-                    house=self.house.name,
-                )
-
-        return _('{name} {longitude} in {sign}').format(
+        formatted = _('{name} {longitude} in {sign}').format(
                 name=self.name,
                 longitude=self.sign_longitude,
                 sign=self.sign,
             )
 
+        if hasattr(self, 'house'):
+            formatted += f', {_(self.house)}'
+
+        if hasattr(self, 'movement'):
+            formatted += f', {_(self.movement)}'
+
+        return formatted
+
 
 class ObjectMovement:
     def __init__(self, object: dict) -> None:

locales/immanuel.pot

@@ -539,10 +539,6 @@ msgstr ""
 msgid "{name} {longitude} in {sign}"
 msgstr ""
 
-# For objects in signs and houses, eg. Sun 10°37'26" in Capricorn, 11th House
-msgid "{name} {longitude} in {sign}, {house}"
-msgstr ""
-
 # For chart subjects, eg. Sat Jan 01 2000 10:00:00 AM PST at 32N43.0, 117W9.0
 msgid "{date_time} at {lat}, {lon}"
 msgstr ""

locales/pt_BR/LC_MESSAGES/immanuel.po

@@ -606,10 +606,6 @@ msgstr "{type} entre {active} e {passive} dentro de {difference} ({movement}, {c
 msgid "{name} {longitude} in {sign}"
 msgstr "{name} {longitude} em {sign}"
 
-# For objects in signs and houses, eg. Sun 10°37'26" in Capricorn, 11th House
-msgid "{name} {longitude} in {sign}, {house}"
-msgstr "{name} {longitude} em {sign}, {house}"
-
 # For chart subjects, eg. Sat Jan 01 2000 10:00:00 AM PST at 32N43.0, 117W9.0
 msgid "{date_time} at {lat}, {lon}"
 msgstr "{date_time} em {lat}, {lon}"

tests/test_localization.py

@@ -498,7 +498,9 @@ def test_formatted_aspect(native):
 def test_formatted_object(native):
     settings.locale = 'pt_BR'
     natal = charts.Natal(native)
-    assert str(natal.objects[chart.SUN]) == 'Sol 10°37\'26" em Capricórnio, Casa 11'
+    assert str(natal.objects[chart.SUN]) == 'Sol 10°37\'26" em Capricórnio, Casa 11, Direto'
+    assert str(natal.objects[chart.ASC]) == 'Ascendente 05°36\'38" em Peixes, Casa 1'
+    assert str(natal.houses[chart.HOUSE2]) == 'Casa 2 17°59\'40" em Áries'
 
 
 def test_formatted_subject(native):