Merge 837f414 into bae8dca

SEED-platform · May 4, 2019 · 332ebcd · 332ebcd
2 parents bae8dca + 837f414
commit 332ebcd
Show file tree

Hide file tree

Showing 27 changed files with 1,281 additions and 96 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# SEED Version 2.5.2
+
+* Placeholder
+
 # SEED Version 2.5.1
 
 Date Range: 03/28/19 - 04/15/19

diff --git a/docs/source/translation.rst b/docs/source/translation.rst
@@ -9,7 +9,7 @@ Translating SEED
 
    .. code:: bash
 
-      scripts/get_python_translations
+      script/get_python_translations
       script/get_angular_translations
 
 4. Verify and commit changes

diff --git a/locale/en_US/LC_MESSAGES/django.mo b/locale/en_US/LC_MESSAGES/django.mo
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
@@ -58,6 +58,9 @@ msgstr "Accept"
 msgid "Accept Terms of Service?"
 msgstr "Accept Terms of Service?"
 
+msgid "Acknowledge"
+msgstr "Acknowledge"
+
 msgid "Actions"
 msgstr "Actions"
 
@@ -333,6 +336,12 @@ msgstr "Column Name"
 msgid "Column Order/Visibility"
 msgstr "Column Order/Visibility"
 
+msgid "COLUMN_NAME_DUPLICATE_ERROR"
+msgstr "Error: New column name cannot match previous name."
+
+msgid "COLUMN_NAME_EXISTS_WARNING"
+msgstr "Warning: Column name already exists."
+
 msgid "Commercial"
 msgstr "Commercial"
 
@@ -471,6 +480,9 @@ msgstr "Created label {label_name}"
 msgid "CREATED_NEW_CYCLE"
 msgstr "Created new Cycle {cycle_name}"
 
+msgid "Current Name"
+msgstr "Current Name"
+
 msgid "Current password"
 msgstr "Current password"
 
@@ -611,6 +623,9 @@ msgstr "Designates whether the user can log into this admin site."
 msgid "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
 msgstr "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
 
+msgid "Desired Name"
+msgstr "Desired Name"
+
 msgid "Determine Time Period from Field:"
 msgstr "Determine Time Period from Field:"
 
@@ -1002,6 +1017,9 @@ msgstr "Invite a New Member"
 msgid "Invite an Owner"
 msgstr "Invite an Owner"
 
+msgid "IRREVERSIBLE_OPERATION_WARNING"
+msgstr "This operation is irreversible."
+
 msgid "It is necessary to map your field names to SEED field names. You can select from the list that appears as you start to type, which is based on the Building Energy Data Exchange Specification (BEDES), or you can type in your own name, as well as typing in the field name from the original datafile."
 msgstr "It is necessary to map your field names to SEED field names. You can select from the list that appears as you start to type, which is based on the Building Energy Data Exchange Specification (BEDES), or you can type in your own name, as well as typing in the field name from the original datafile."
 
@@ -1095,6 +1113,9 @@ msgstr "Log in to SEED Platform"
 msgid "Logout"
 msgstr "Logout"
 
+msgid "LONG_OPERATION_WARNING"
+msgstr "This operation may take a while."
+
 msgid "Make this a snapshot project."
 msgstr "Make this a snapshot project."
 
@@ -1289,6 +1310,9 @@ msgstr "New properties"
 msgid "New tax lots"
 msgstr "New tax lots"
 
+msgid "NEW_COLUMN_REPLACE_DATA_WARNING"
+msgstr "A new column will be created, and/or existing data can be replaced."
+
 msgid "Next"
 msgstr "Next"
 
@@ -1406,6 +1430,9 @@ msgstr "Organizations I Manage"
 msgid "Organizations:"
 msgstr "Organizations:"
 
+msgid "OVERWRITE_COLUMN_DATA_QUESTION"
+msgstr "Overwrite data?"
+
 msgid "Owner"
 msgstr "Owner"
 
@@ -1695,6 +1722,9 @@ msgstr "Remove User"
 msgid "Removing buildings from project"
 msgstr "Removing buildings from project"
 
+msgid "RENAME_COLUMN_TITLE"
+msgstr "Rename Column"
+
 msgid "Reorder Columns"
 msgstr "Reorder Columns"
 
@@ -2282,6 +2312,9 @@ msgstr "users"
 msgid "Using your current browser will prevent you from accessing features on our website. Use the links below to download a new browser or upgrade your existing browser."
 msgstr "Using your current browser will prevent you from accessing features on our website. Use the links below to download a new browser or upgrade your existing browser."
 
+msgid "USING_DEFAULT_UNITS_WARNING"
+msgstr "For columns with unit settings, default units will be used for conversions."
+
 msgid "Version"
 msgstr "Version"
 

diff --git a/locale/fr_CA/LC_MESSAGES/django.mo b/locale/fr_CA/LC_MESSAGES/django.mo
diff --git a/locale/fr_CA/LC_MESSAGES/django.po b/locale/fr_CA/LC_MESSAGES/django.po
@@ -59,6 +59,9 @@ msgstr "Acceptez"
 msgid "Accept Terms of Service?"
 msgstr "Accepter les conditions d'utilisation?"
 
+msgid "Acknowledge"
+msgstr "Reconnaître"
+
 msgid "Actions"
 msgstr "Actions"
 
@@ -336,6 +339,12 @@ msgstr "Nom de colonne"
 msgid "Column Order/Visibility"
 msgstr "L'Ordre Des Colonnes/Visibilité"
 
+msgid "COLUMN_NAME_DUPLICATE_ERROR"
+msgstr "Erreur: Le nom de la nouvelle colonne ne peut pas correspondre au nom précédent."
+
+msgid "COLUMN_NAME_EXISTS_WARNING"
+msgstr "Attention: le nom de la colonne existe déjà."
+
 msgid "Commercial"
 msgstr "Commercial"
 
@@ -474,6 +483,9 @@ msgstr "Créé étiquette {label_name}"
 msgid "CREATED_NEW_CYCLE"
 msgstr "Nouveau cycle créé avec nom {cycle_name}"
 
+msgid "Current Name"
+msgstr "Nom Actuel"
+
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
@@ -614,6 +626,9 @@ msgstr "Désigne si l'utilisateur peut se connecter à ce site d'administration.
 msgid "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
 msgstr "Indique si cet utilisateur doit être traité comme actif. Désélectionnez ceci au lieu de supprimer des comptes."
 
+msgid "Desired Name"
+msgstr "Nom Désiré"
+
 msgid "Determine Time Period from Field:"
 msgstr "Déterminer la durée du champ:"
 
@@ -1006,6 +1021,9 @@ msgstr "Inviter un nouveau membre"
 msgid "Invite an Owner"
 msgstr "Inviter un propriétaire"
 
+msgid "IRREVERSIBLE_OPERATION_WARNING"
+msgstr "Cette opération est irréversible."
+
 msgid "It is necessary to map your field names to SEED field names. You can select from the list that appears as you start to type, which is based on the Building Energy Data Exchange Specification (BEDES), or you can type in your own name, as well as typing in the field name from the original datafile."
 msgstr "Il est nécessaire de mapper vos noms de champs aux noms de champs SEED. Vous pouvez sélectionner dans la liste qui apparaît lorsque vous commencez à taper, qui est basée sur la spécification BEDES (Building Energy Data Exchange Specification) ou vous pouvez taper votre propre nom et saisir le nom du champ dans le fichier de données d'origine."
 
@@ -1100,6 +1118,9 @@ msgstr "Connectez-vous à SEED Platform"
 msgid "Logout"
 msgstr "Déconnexion"
 
+msgid "LONG_OPERATION_WARNING"
+msgstr "Cette opération peut prendre un certain temps."
+
 msgid "Make this a snapshot project."
 msgstr "Faire un projet de capture instantanée."
 
@@ -1294,6 +1315,9 @@ msgstr "Nouvelles propriétés"
 msgid "New tax lots"
 msgstr "Nouveaux lots d'impôt"
 
+msgid "NEW_COLUMN_REPLACE_DATA_WARNING"
+msgstr "Une nouvelle colonne sera créée et/ou les données existantes peuvent être remplacées."
+
 msgid "Next"
 msgstr "Prochain"
 
@@ -1411,6 +1435,9 @@ msgstr "Organisations que je gère"
 msgid "Organizations:"
 msgstr "Organisations:"
 
+msgid "OVERWRITE_COLUMN_DATA_QUESTION"
+msgstr "Écraser les données?"
+
 msgid "Owner"
 msgstr "Propriétaire"
 
@@ -1700,6 +1727,9 @@ msgstr "Supprimer l'utilisateur"
 msgid "Removing buildings from project"
 msgstr "Retrait des bâtiments du projet"
 
+msgid "RENAME_COLUMN_TITLE"
+msgstr "Renommer la Colonne"
+
 msgid "Reorder Columns"
 msgstr "Réorganiser les colonnes"
 
@@ -2288,6 +2318,10 @@ msgstr "utilisateurs"
 msgid "Using your current browser will prevent you from accessing features on our website. Use the links below to download a new browser or upgrade your existing browser."
 msgstr "L'utilisation de votre navigateur actuel vous empêchera d'accéder aux fonctionnalités de notre site Web. Utilisez les liens ci-dessous pour télécharger un nouveau navigateur ou mettre à niveau votre navigateur existant."
 
+#, fuzzy
+msgid "USING_DEFAULT_UNITS_WARNING"
+msgstr "Pour les colonnes avec des paramètres d'unité, les unités par défaut seront utilisées pour les conversions."
+
 msgid "Version"
 msgstr "Version"
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "SEED",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Standard Energy Efficiency Data (SEED) Platform™",
   "license": "SEE LICENSE IN LICENSE",
   "directories": {

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -44,7 +44,7 @@ raven==6.9.0
 jellyfish==0.6.1
 Markdown==3.0.1
 python-dateutil==2.7.3
-street-address==0.3.0
+street-address==0.4.0
 unicodecsv==0.14.1
 unidecode==1.0.22
 usaddress==0.5.10

diff --git a/script/get_python_translations b/script/get_python_translations
@@ -18,9 +18,9 @@ lokalise                \
 unzip $tmp/SEED_Platform-locale.zip -d $tmp
 
 mv $tmp/locale/fr_CA.po $dest/fr_CA/LC_MESSAGES/django.po
-/usr/local/opt/gettext/bin/msgfmt -o $dest/fr_CA/LC_MESSAGES/django.{mo,po}
+msgfmt -o $dest/fr_CA/LC_MESSAGES/django.{mo,po}
 
 mv $tmp/locale/en_US.po $dest/en_US/LC_MESSAGES/django.po
-/usr/local/opt/gettext/bin/msgfmt -o $dest/en_US/LC_MESSAGES/django.{mo,po}
+msgfmt -o $dest/en_US/LC_MESSAGES/django.{mo,po}
 
 rm -rf $tmp
diff --git a/seed/data_importer/equivalence_partitioner.py b/seed/data_importer/equivalence_partitioner.py
@@ -17,8 +17,6 @@
 
 _log = get_task_logger(__name__)
 
-STR_TO_CLASS = {'TaxLotState': TaxLotState, 'PropertyState': PropertyState}
-
 
 class EquivalencePartitioner(object):
     """Class for calculating equivalence classes on model States

diff --git a/seed/migrations/0102_auto_20190503_1251.py b/seed/migrations/0102_auto_20190503_1251.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-05-03 19:51
+from __future__ import unicode_literals
+
+from django.db import migrations, transaction
+
+from seed.utils.address import normalize_address_str
+
+
+def forwards(apps, schema_editor):
+    PropertyState = apps.get_model("seed", "PropertyState")
+    TaxLotState = apps.get_model("seed", "TaxLotState")
+
+    with transaction.atomic():
+        for index, p in enumerate(PropertyState.objects.filter(address_line_1__isnull=False)):
+            if index % 1000 == 0:
+                print('iterating ... %s' % index)
+
+            p.normalized_address = normalize_address_str(p.address_line_1)
+            p.save(update_fields=["normalized_address"])
+
+        for index, t in enumerate(TaxLotState.objects.filter(address_line_1__isnull=False)):
+            if index % 1000 == 0:
+                print('iterating ... %s' % index)
+
+            t.normalized_address = normalize_address_str(t.address_line_1)
+            t.save(update_fields=["normalized_address"])
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('seed', '0101_auto_20190318_1835'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards),
+    ]