Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ADX-1024 New country estimates dataset for 2024 #293

Merged
merged 2 commits into from
Aug 2, 2023
Merged

ADX-1024 New country estimates dataset for 2024 #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4efc7fe
ADX-1024 New country estimates dataset for 2024
tomeksabala Aug 2, 2023
c1525a8
ADX-1024 Flake8 fixup.
tomeksabala Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ckanext/unaids/i18n/fr/LC_MESSAGES/ckanext-unaids.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,10 +607,10 @@ msgid "HIV Estimates<br />Navigator"
msgstr "Navigateur<br />pour les Estimations du VIH"

#: ckanext/unaids/theme/templates/home/layout1.html:51
msgid "Instructions to upload your<br />Country Estimates 2023 Data"
msgid "Instructions to upload your<br />Country Estimates 2024 Data"
msgstr ""
"Instructions pour mettre en ligne vos<br />données sur les estimations "
"2023"
"2024"

#: ckanext/unaids/theme/templates/home/layout1.html:55
msgid "Unsure what to do next?"
Expand Down
4 changes: 2 additions & 2 deletions ckanext/unaids/i18n/pt_PT/LC_MESSAGES/ckanext-unaids.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,8 @@ msgstr "Navegador<br />de estimativas sobre o VIH"

#: ckanext/unaids/theme/templates/home/layout1.html:51
#, fuzzy
msgid "Instructions to upload your<br />Country Estimates 2023 Data"
msgstr "Instruções para carregar os seus<br>dados de Estimativas do país 2022"
msgid "Instructions to upload your<br />Country Estimates 2024 Data"
msgstr "Instruções para carregar os seus<br>dados de Estimativas do país 2024"

#: ckanext/unaids/theme/templates/home/layout1.html:55
msgid "Unsure what to do next?"
Expand Down
2 changes: 1 addition & 1 deletion ckanext/unaids/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ def _data_dict_is_resource(data_dict):
def _giftless_upload(context, resource, current=None):
attached_file = resource.pop("upload", None)
if attached_file:
if type(attached_file) == FlaskFileStorage:
if type(attached_file) is FlaskFileStorage:
ChasNelson1990 marked this conversation as resolved.
Show resolved Hide resolved
dataset_id = resource.get("package_id")
if not dataset_id:
dataset_id = current["package_id"]
Expand Down
2 changes: 1 addition & 1 deletion ckanext/unaids/theme/templates/home/layout1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
href="/{{h.lang()}}/pages/{{inputs_page}}"
target="_blank">
<i class="fa fa-info-circle"></i>
<span class="button-text">{{_('Instructions to upload your<br />Country Estimates 2023 Data')}}</span>
<span class="button-text">{{_('Instructions to upload your<br />Country Estimates 2024 Data')}}</span>
</a>
</div>
<div class="hidden-xs hidden-sm col-md-6 col-lg-4 whats-next">
Expand Down
2 changes: 1 addition & 1 deletion ckanext/unaids/theme/templates/snippets/dataset_selector.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<i class="fa fa-plus-square"></i> {{_('Add Dataset')}}
</button>
<div class="dropdown-menu" aria-labelledby="addDatasetMenuButton">
{% snippet 'snippets/add_dataset.html', dataset_type='country-estimates-23' %}
{% snippet 'snippets/add_dataset.html', dataset_type='country-estimates-24' %}
{% snippet 'snippets/add_dataset.html', dataset_type='dataset-2' %}
</div>
</div>
Loading