Merge branch 'develop' into 2693-feature/bsync_support_v2

SEED-platform · Jul 27, 2021 · dc33592 · dc33592
2 parents 793e5b7 + 95fb297
commit dc33592
Show file tree

Hide file tree

Showing 21 changed files with 519 additions and 60 deletions.
diff --git a/docs/source/migrations.rst b/docs/source/migrations.rst
@@ -47,8 +47,16 @@ local_untracked.py file
         ),
     )
 
+Version 2.11.0
+--------------
+- There are no special migrations needed for this version. Simply run `./manage.py migrate`.
+
+Version 2.10.0
+--------------
+- There are no special migrations needed for this version. Simply run `./manage.py migrate`.
+
 Version 2.7.3 to 2.9.0
----------------------
+----------------------
 - The migrations should work without additional support. Simply run `./manage.py migrate`.
 
 Version 2.7.2
@@ -63,7 +71,7 @@ Version 2.7.1
 
 **Important Note:**
 
-If upgrading from < 2.7.0 to >= 2.7.1 you may encounter a failed migration with ``0118_match_merge_link_all_orgs``.  This is expected if the database is several versions behind, and it effectively reorders migration 118 to run after all other migrations have completed to prepare your database to recognize properties and taxlots across multiple cycles.  Run the following code manually to fully migrate:
+If upgrading from `< 2.7.0` to `>= 2.7.1` you may encounter a failed migration with ``0118_match_merge_link_all_orgs``.  This is expected if the database is several versions behind, and it effectively reorders migration 118 to run after all other migrations have completed to prepare your database to recognize properties and taxlots across multiple cycles.  Run the following code manually to fully migrate:
 
 #. ``./manage.py migrate --fake seed 0118_match_merge_link_all_orgs``
 
@@ -97,7 +105,7 @@ Version 2.6.0
 -------------
 
 Version 2.6.0 includes support for meters and time series data storage. In order to use this release
-you must first install [timescaledb](https://docs.timescale.com/v1.2/getting-started).
+you must first install `TimescaleDB`_.
 
 Docker-based Deployment
 ^^^^^^^^^^^^^^^^^^^^^^^
@@ -190,3 +198,5 @@ Development
 .. _`MapQuest Developer`: https://developer.mapquest.com/plan_purchase/steps/business_edition/business_edition_free/register
 
 .. _`MapQuest Key`: https://developer.mapquest.com/user/me/apps
+
+.. _`TimescaleDB`: https://docs.timescale.com/v1.2/getting-started
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
@@ -242,9 +242,6 @@ msgstr "auto-mapping energy data"
 msgid "auto-matching energy data"
 msgstr "auto-matching energy data"
 
-msgid "available templates"
-msgstr "available templates"
-
 #: seed/landing/templates/landing/thank_you.html:17
 msgid "Back"
 msgstr "Back"
@@ -2965,6 +2962,9 @@ msgstr "View Project"
 msgid "Viewer"
 msgstr "Viewer"
 
+msgid "Visit the BETTER website to run a portfolio analysis"
+msgstr "Visit the BETTER website to run a portfolio analysis"
+
 msgid "Warning"
 msgstr "Warning"
 

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
@@ -2985,6 +2985,9 @@ msgstr "Voir le projet"
 msgid "Viewer"
 msgstr "Spectateur"
 
+msgid "Visit the BETTER website to run a portfolio analysis"
+msgstr "Visitez le site Web de BETTER pour effectuer une analyse de portefeuille"
+
 msgid "Warning"
 msgstr "Mise en garde"