Skip to content

Commit

Permalink
Merge pull request #2988 from SEED-platform/chore/label-analysis-as-beta
Browse files Browse the repository at this point in the history
Chore/label analysis as beta
  • Loading branch information
macintoshpie committed Nov 3, 2021
2 parents 669deaf + 5567d10 commit 4d262e9
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 12 deletions.
Binary file modified locale/en_US/LC_MESSAGES/django.mo
Binary file not shown.
10 changes: 8 additions & 2 deletions locale/en_US/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,10 @@ msgid "An error occurred while processing the file. Please ensure that your file
msgstr "An error occurred while processing the file. Please ensure that your file meets the required specifications."

msgid "Analyses"
msgstr "Analyses"
msgstr "Analyses (beta)"

msgid "Analysis"
msgstr "Analysis (beta)"

msgid "Analysis Name"
msgstr "Analysis Name"
Expand Down Expand Up @@ -1585,7 +1588,7 @@ msgid "National Renewable Energy Laboratory"
msgstr "National Renewable Energy Laboratory"

msgid "New Analysis"
msgstr "New Analysis"
msgstr "New Analysis (beta)"

msgid "New Note"
msgstr "New Note"
Expand Down Expand Up @@ -2102,6 +2105,9 @@ msgstr "Row 5"
msgid "Rules for a single field must have the same Data Type. Note that some Data Types are not available to certain Condition Checks."
msgstr "Rules for a single field must have the same Data Type. Note that some Data Types are not available to certain Condition Checks."

msgid "Run Analysis"
msgstr "Run Analysis (beta)"

msgid "Run Author"
msgstr "Run Author"

Expand Down
Binary file modified locale/fr_CA/LC_MESSAGES/django.mo
Binary file not shown.
10 changes: 8 additions & 2 deletions locale/fr_CA/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ msgid "An error occurred while processing the file. Please ensure that your file
msgstr "Une erreur s'est produite lors du traitement du fichier. Assurez-vous que votre fichier respecte les spécifications requises."

msgid "Analyses"
msgstr "Analyses"
msgstr "Analyses (bêta)"

msgid "Analysis"
msgstr "Analyse (bêta)"

msgid "Analysis Name"
msgstr "Nom de l'analyse"
Expand Down Expand Up @@ -1598,7 +1601,7 @@ msgid "National Renewable Energy Laboratory"
msgstr "Laboratoire National Des Énergies Renouvelables"

msgid "New Analysis"
msgstr "Nouvelle analyse"
msgstr "Nouvelle analyse (bêta)"

msgid "New Note"
msgstr "Nouvelle note"
Expand Down Expand Up @@ -2120,6 +2123,9 @@ msgstr "Rangée 5"
msgid "Rules for a single field must have the same Data Type. Note that some Data Types are not available to certain Condition Checks."
msgstr "Les règles pour un seul champ doivent avoir le même type de données. Notez que certains types de données ne sont pas disponibles pour certaines vérifications de condition."

msgid "Run Analysis"
msgstr "Exécuter l'analyse (bêta)"

msgid "Run Author"
msgstr "Exécuter l'auteur"

Expand Down
6 changes: 4 additions & 2 deletions seed/static/seed/locales/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
"Address Line 2 (Tax Lot)": "Address Line 2 (Tax Lot)",
"Admin": "Admin",
"An error occurred while processing the file. Please ensure that your file meets the required specifications.": "An error occurred while processing the file. Please ensure that your file meets the required specifications.",
"Analyses": "Analyses",
"Analyses": "Analyses (beta)",
"Analysis": "Analysis (beta)",
"Analysis Name": "Analysis Name",
"Analysis Name (User Defined)": "Analysis Name (User Defined)",
"Analysis State": "Analysis State",
Expand Down Expand Up @@ -512,7 +513,7 @@
"NUM_PROPERTY_TAXLOT_COLUMNS_AVAILABLE": "There are {num_property_columns} property columns and { num_taxlot_columns } tax lot columns of data available to you.",
"Name": "Name",
"National Renewable Energy Laboratory": "National Renewable Energy Laboratory",
"New Analysis": "New Analysis",
"New Analysis": "New Analysis (beta)",
"New Note": "New Note",
"New User Email": "New User Email",
"New password": "New password",
Expand Down Expand Up @@ -679,6 +680,7 @@
"Row 4": "Row 4",
"Row 5": "Row 5",
"Rules for a single field must have the same Data Type. Note that some Data Types are not available to certain Condition Checks.": "Rules for a single field must have the same Data Type. Note that some Data Types are not available to certain Condition Checks.",
"Run Analysis": "Run Analysis (beta)",
"Run Author": "Run Author",
"Run Date": "Run Date",
"Run Duration": "Run Duration",
Expand Down
6 changes: 4 additions & 2 deletions seed/static/seed/locales/fr_CA.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
"Address Line 2 (Tax Lot)": "Adresse Ligne 2 (Lot d'impôt)",
"Admin": "Admin",
"An error occurred while processing the file. Please ensure that your file meets the required specifications.": "Une erreur s'est produite lors du traitement du fichier. Assurez-vous que votre fichier respecte les spécifications requises.",
"Analyses": "Analyses",
"Analyses": "Analyses (bêta)",
"Analysis": "Analyse (bêta)",
"Analysis Name": "Nom de l'analyse",
"Analysis Name (User Defined)": "Nom de l'analyse (défini par l'utilisateur)",
"Analysis State": "État d'analyse",
Expand Down Expand Up @@ -512,7 +513,7 @@
"NUM_PROPERTY_TAXLOT_COLUMNS_AVAILABLE": "Il existe {num_property_columns} colonnes de propriétés et {num_taxlot_columns} colonnes de lot d'impôt qui vous sont accessibles.",
"Name": "nom",
"National Renewable Energy Laboratory": "Laboratoire National Des Énergies Renouvelables",
"New Analysis": "Nouvelle analyse",
"New Analysis": "Nouvelle analyse (bêta)",
"New Note": "Nouvelle note",
"New User Email": "E-mail du nouvel utilisateur",
"New password": "Nouveau mot de passe",
Expand Down Expand Up @@ -679,6 +680,7 @@
"Row 4": "Rangée 4",
"Row 5": "Rangée 5",
"Rules for a single field must have the same Data Type. Note that some Data Types are not available to certain Condition Checks.": "Les règles pour un seul champ doivent avoir le même type de données. Notez que certains types de données ne sont pas disponibles pour certaines vérifications de condition.",
"Run Analysis": "Exécuter l'analyse (bêta)",
"Run Author": "Exécuter l'auteur",
"Run Date": "Date d'exécution",
"Run Duration": "Durée de l'exécution",
Expand Down
2 changes: 1 addition & 1 deletion seed/static/seed/partials/inventory_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ <h2>
</li>

<li role="menuitem">
<a ng-click="open_analyses_modal()">{$:: 'Run Analysis'$}</a>
<a ng-click="open_analyses_modal()">{$:: 'Run Analysis' | translate $}</a>
</li>

<li role="menuitem" ng-if="::historical_items.length > 1">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div>
<div class="modal-header">
<h4 class="modal-title" id="manageLabelsModalLabel">Run Analysis</h4>
<h4 class="modal-title" id="manageLabelsModalLabel" translate>Run Analysis</h4>
</div>
<div class="modal-body">
<div class="newAnalysisInput" style="margin-top:0;">
Expand Down
2 changes: 1 addition & 1 deletion seed/static/seed/partials/inventory_detail_nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
--><a id="inventory-detail-notes" ui-sref="inventory_detail_notes(::{inventory_type: inventory_type, view_id: inventory.view_id})" ui-sref-active="active" translate>Notes</a><!--
--><a id="settings" ui-sref="detail_column_list_profiles(::{inventory_type: inventory_type, view_id: inventory.view_id})" ui-sref-active="active" translate>Column List Profiles</a><!--
--><a id="settings" ui-sref="inventory_detail_cycles(::{inventory_type: inventory_type, view_id: inventory.view_id})" ui-sref-active="active" translate>Cross-Cycles</a><!--
--><a id="inventory-detail" ng-if="::inventory_type==='properties'" ui-sref="inventory_detail_analyses(::{inventory_type: inventory_type, view_id: inventory.view_id})" ui-sref-active="active">Analyses</a>
--><a id="inventory-detail" ng-if="::inventory_type==='properties'" ui-sref="inventory_detail_analyses(::{inventory_type: inventory_type, view_id: inventory.view_id})" ui-sref-active="active" translate>Analyses</a>
2 changes: 1 addition & 1 deletion seed/templates/seed/_sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div class="item_name" translate>Organizations</div>
<div ng-show="logged_in" class="badge badge_menu">{$ organizations_count | number:0 $}</div>
</a>
<a id="sidebar-accounts" ng-class="{item: true, active: is_active('/analyses/' + menu.user.organization.id), 'disabled-item': !logged_in}" title="{$:: 'Analyses' | translate $}" href="{% url "seed:home" %}#/analyses">
<a id="sidebar-accounts" ng-class="{item: true, active: is_active('/analyses'), 'disabled-item': !logged_in}" title="{$:: 'Analyses' | translate $}" href="{% url "seed:home" %}#/analyses">
<div class="icon"><i class="fa fa-bar-chart"></i></div>
<div class="item_name" translate>Analyses</div>
</a>
Expand Down

0 comments on commit 4d262e9

Please sign in to comment.