Merge branch 'develop' into fix/cycle-deletion

SEED-platform · Mar 23, 2021 · 6ea86b1 · 6ea86b1
2 parents 8c22bf6 + 42abbe1
commit 6ea86b1
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 15 deletions.
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
@@ -592,6 +592,9 @@ msgstr "Create a user"
 msgid "Create an organization"
 msgstr "Create an organization"
 
+msgid "Create an Organization to continue"
+msgstr "Create an Organization to continue"
+
 msgid "Create Analysis"
 msgstr "Create Analysis"
 
@@ -1073,8 +1076,8 @@ msgstr "File Source:"
 msgid "FILE_TYPES_SUPPORTED"
 msgstr "File types supported: <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, <strong>.xml</strong>, <strong>.zip</strong>, <strong>.geojson</strong>, and <strong>.json</strong>."
 
-msgid "Files (Master State Only)"
-msgstr "Files (Master State Only)"
+msgid "Files (Main State Only)"
+msgstr "Files (Main State Only)"
 
 msgid "Filter by label"
 msgstr "Filter by label"
@@ -1470,6 +1473,9 @@ msgstr "This operation may take a while."
 msgid "Longitude"
 msgstr "Longitude"
 
+msgid "Main"
+msgstr "Main"
+
 msgid "Maintenance"
 msgstr "Maintenance"
 
@@ -1528,9 +1534,6 @@ msgstr "Match-up your buildings list with the Portfolio Manager dataset to tie b
 msgid "MARKETING_BULLET_3"
 msgstr "Use SEED Platform's flexible, easy-to-use labeling system and inventory groupings to track the status of data submission, review, and compliance."
 
-msgid "Master"
-msgstr "Master"
-
 msgid "Match"
 msgstr "Match"
 

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
@@ -599,6 +599,9 @@ msgstr "Créer un utilisateur"
 msgid "Create an organization"
 msgstr "Créer une organisation"
 
+msgid "Create an Organization to continue"
+msgstr "Créer une organisation pour continuer"
+
 msgid "Create Analysis"
 msgstr "Créer une analyse"
 
@@ -1082,7 +1085,8 @@ msgstr "Source du fichier:"
 msgid "FILE_TYPES_SUPPORTED"
 msgstr "Types de fichiers pris en charge: <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, <strong>.xml</strong>, <strong>.zip</strong>, <strong>.geojson</strong>, et <strong>.json</strong>."
 
-msgid "Files (Master State Only)"
+#, fuzzy
+msgid "Files (Main State Only)"
 msgstr "Fichiers (état principal uniquement)"
 
 msgid "Filter by label"
@@ -1481,6 +1485,9 @@ msgstr "Cette opération peut prendre un certain temps."
 msgid "Longitude"
 msgstr "Longitude"
 
+msgid "Main"
+msgstr "Principale"
+
 msgid "Maintenance"
 msgstr "Maintenance"
 
@@ -1539,9 +1546,6 @@ msgstr "Associez votre liste de bâtiments à l'ensemble de données Portfolio M
 msgid "MARKETING_BULLET_3"
 msgstr "Utilisez le système d'étiquetage flexible et facile à utiliser de SEED Platform et les regroupements d'inventaire pour suivre l'état de la soumission, de l'examen et de la conformité des données."
 
-msgid "Master"
-msgstr "Maître"
-
 msgid "Match"
 msgstr "Faire correspondre"
 

diff --git a/seed/static/seed/locales/en_US.json b/seed/static/seed/locales/en_US.json
@@ -185,6 +185,7 @@
     "Create a new...": "Create a new...",
     "Create a user": "Create a user",
     "Create an organization": "Create an organization",
+    "Create an Organization to continue": "Create an Organization to continue",
     "Create Analysis": "Create Analysis",
     "Create Cycle": "Create Cycle",
     "Create Data Set": "Create Data Set",
@@ -341,7 +342,7 @@
     "File Name": "File Name",
     "File Source:": "File Source:",
     "FILE_TYPES_SUPPORTED": "File types supported: <strong>.csv<\/strong>, <strong>.xls<\/strong>, <strong>.xlsx<\/strong>, <strong>.xml<\/strong>, <strong>.zip<\/strong>, <strong>.geojson<\/strong>, and <strong>.json<\/strong>.",
-    "Files (Master State Only)": "Files (Master State Only)",
+    "Files (Main State Only)": "Files (Main State Only)",
     "Filter by label": "Filter by label",
     "Filter by label:": "Filter by label:",
     "Finding inventory matches for": "Finding inventory matches for",
@@ -468,6 +469,7 @@
     "Logout": "Logout",
     "LONG_OPERATION_WARNING": "This operation may take a while.",
     "Longitude": "Longitude",
+    "Main": "Main",
     "Maintenance": "Maintenance",
     "Maintenance Actions": "Maintenance Actions",
     "Make this a snapshot project.": "Make this a snapshot project.",
@@ -487,7 +489,6 @@
     "MARKETING_BULLET_1": "Get started using SEED Platform™ by uploading your buildings list (city tax assessor data) and then your EPA Portfolio Manager data. Make sure these files are each in .csv, .xls, .xlsx, or .xml format. The SEED Platform will help you map and validate your data in the process of loading.",
     "MARKETING_BULLET_2": "Match-up your buildings list with the Portfolio Manager dataset to tie building records together. SEED Platform will help you by auto-matching high confidence pairings and then provide you with tools to match the rest of your dataset.",
     "MARKETING_BULLET_3": "Use SEED Platform's flexible, easy-to-use labeling system and inventory groupings to track the status of data submission, review, and compliance.",
-    "Master": "Master",
     "Match": "Match",
     "Match Criteria": "Match Criteria",
     "Match Properties": "Match Properties",

diff --git a/seed/static/seed/locales/fr_CA.json b/seed/static/seed/locales/fr_CA.json
@@ -185,6 +185,7 @@
     "Create a new...": "Créer un nouveau...",
     "Create a user": "Créer un utilisateur",
     "Create an organization": "Créer une organisation",
+    "Create an Organization to continue": "Créer une organisation pour continuer",
     "Create Analysis": "Créer une analyse",
     "Create Cycle": "Créer un cycle",
     "Create Data Set": "Créer un ensemble de données",
@@ -341,7 +342,7 @@
     "File Name": "Nom de fichier",
     "File Source:": "Source du fichier:",
     "FILE_TYPES_SUPPORTED": "Types de fichiers pris en charge: <strong>.csv<\/strong>, <strong>.xls<\/strong>, <strong>.xlsx<\/strong>, <strong>.xml<\/strong>, <strong>.zip<\/strong>, <strong>.geojson<\/strong>, et <strong>.json<\/strong>.",
-    "Files (Master State Only)": "Fichiers (état principal uniquement)",
+    "Files (Main State Only)": "Fichiers (état principal uniquement)",
     "Filter by label": "Filtrer par étiquette",
     "Filter by label:": "Filtrer par étiquette:",
     "Finding inventory matches for": "Trouver des correspondances d'inventaire pour",
@@ -468,6 +469,7 @@
     "Logout": "Déconnexion",
     "LONG_OPERATION_WARNING": "Cette opération peut prendre un certain temps.",
     "Longitude": "Longitude",
+    "Main": "Principale",
     "Maintenance": "Maintenance",
     "Maintenance Actions": "Actions de maintenance",
     "Make this a snapshot project.": "Faire un projet de capture instantanée.",
@@ -487,7 +489,6 @@
     "MARKETING_BULLET_1": "Commencez à utiliser SEED Platform™ en téléchargeant votre liste de bâtiments (données de l'évaluateur de la taxe de séjour), puis vos données EPA Portfolio Manager. Assurez-vous que ces fichiers sont au format .csv, .xls, .xlsx ou .xml. La plate-forme SEED vous aidera à mapper et valider vos données dans le processus de chargement.",
     "MARKETING_BULLET_2": "Associez votre liste de bâtiments à l'ensemble de données Portfolio Manager pour lier ensemble les enregistrements de construction. SEED Platform vous aidera à apparier automatiquement les couplages de confiance et à vous fournir des outils qui correspondent au reste de votre jeu de données.",
     "MARKETING_BULLET_3": "Utilisez le système d'étiquetage flexible et facile à utiliser de SEED Platform et les regroupements d'inventaire pour suivre l'état de la soumission, de l'examen et de la conformité des données.",
-    "Master": "Maître",
     "Match": "Faire correspondre",
     "Match Criteria": "Critères de correspondance",
     "Match Properties": "Faire correspondre des propriétes",

diff --git a/seed/static/seed/partials/inventory_detail.html b/seed/static/seed/partials/inventory_detail.html
@@ -140,7 +140,7 @@ <h2>
                         <tr>
                             <th id="building-fields">{$:: 'Field' | translate $}</th>
                             <th id="building-fields" ng-click="toggle_freeze()">
-                                <span class="pin">{$:: 'Master' | translate $}
+                                <span class="pin">{$:: 'Main' | translate $}
                                     <i class="glyphicon glyphicon-pushpin"></i>
                                 </span>
                             </th>
@@ -284,7 +284,7 @@ <h2 ng-if="::inventory_type==='properties'">
                     <div class="section_header fixed_height_short has_no_padding">
                         <div class="section_action_container left" style="width: 50%;">
                         <span>
-                            <h2><i class="fa fa-file"></i> {$:: 'Files (Master State Only)' | translate $}</h2>
+                            <h2><i class="fa fa-file"></i> {$:: 'Files (Main State Only)' | translate $}</h2>
                         </span>
                         </div>
                     </div>