Skip to content

Remaining items: #356

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

Merged
wasade merged 2 commits into from
Apr 23, 2026
Merged

Remaining items: #356

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
0a484be
Remaining items:
wasade Apr 10, 2026
2eabeb8
missed one:
wasade Apr 10, 2026
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,6 @@ dmypy.json

# Mac OS X Useless File
.DS_Store

# Local documentation (not tracked)
localdocs/
2 changes: 1 addition & 1 deletion microsetta_interface/templates/account_details.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@
<div class="col-12">
<label for="consent_privacy_terms" name="consent_privacy_terms_label" class="tmi-content">
<input id="consent_privacy_terms" name="consent_privacy_terms" type="checkbox" value="True">
{{ _('I agree to the <a href="https://microsetta.ucsd.edu/privacy-statement/" target="_blank">Privacy Statement</a> and accept the <a href="https://microsetta.ucsd.edu/terms-and-conditions/" target="_blank">Terms and Conditions</a>') }}
{{ _('I agree to the <a href="https://americangut.ucsd.edu/privacy-statement/" target="_blank">Privacy Statement</a> and accept the <a href="https://americangut.ucsd.edu/terms-and-conditions/" target="_blank">Terms and Conditions</a>') }}
</label><br />
<label for="consent_privacy_terms" class="error" style="display: none;">{{ _('Please agree to the Privacy Statement and Terms and Conditions') }}</label>
</div>
Expand Down
2 changes: 1 addition & 1 deletion microsetta_interface/templates/error.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{{ _('An error has occurred (see below). We apologize for any inconvenience.') }}
</p>
<p>
{{ _('If you have any concerns, please email us at') }} <a href="{{ mailto_url }}">microsetta@ucsd.edu</a> {{ _('with a copy of the error message below.') }}
{{ _('If you have any concerns, please email us at') }} <a href="{{ mailto_url }}">americangut.ucsd.edu</a> {{ _('with a copy of the error message below.') }}
</p>
<strong>{{ _('Error') }}:</strong>
<br/>
Expand Down
2 changes: 1 addition & 1 deletion microsetta_interface/templates/kits.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
<span class='kit-important'>{{ _('Important') }}:</span> <br />
{{ _('The sample cannot be processed in the lab until this information is complete.') }} <br />
{{ _('Keep a record of these details. The barcode is needed to resolve any issues you may have with your sample collection.') }}<br />
{{ _('If the barcode(s) listed do not match the barcode(s) on your collection device(s), please contact us at <a href=\'mailto:microsetta@ucsd.edu\'>microsetta@ucsd.edu</a>.') }}</i></span>" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="top" title="">{{ _('What is the barcode and why is it important?') }}</a></span></p><br />
{{ _('If the barcode(s) listed do not match the barcode(s) on your collection device(s), please contact us at <a href=\'mailto:americangut@ucsd.edu\'>americangut.ucsd.edu</a>.') }}</i></span>" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="top" title="">{{ _('What is the barcode and why is it important?') }}</a></span></p><br />
<form method="post" name="pick_samples_form" id="pick_samples_form" action="/accounts/{{account_id}}/sources/{{source_id}}/claim_samples" style="padding: 0;">
<div class="new_kit_sample_container" id="new_kit_sample_container">

Expand Down
6 changes: 3 additions & 3 deletions microsetta_interface/templates/new_results_page.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@
'button_text': "{{ _('Microbiomes Across the Body') }}",
'img_div_id': 'pcoa-tmi-all-samples',
'img_id': 'pcoa-tmi-all-samples-img',
'description': "<p>{{ _('In this map, we\'ve placed your sample relative to all the other samples we have in Microsetta. As you can see, there are a few different types of samples people have contributed, and the microbial configurations present can be VERY different.') }}</p>"},
'description': "<p>{{ _('In this map, we\'ve placed your sample relative to all the other samples we have in American Gut. As you can see, there are a few different types of samples people have contributed, and the microbial configurations present can be VERY different.') }}</p>"},
'tmi_16S_gut_multipop': {
'dataset': 'multipop-16S-gut',
'category': 'microbial_map_region',
Expand Down Expand Up @@ -1235,7 +1235,7 @@
};
let data = [trace1, trace2];
let layout = {
"title": "{{ _('How abundant are my microbes compared everyone in Microsetta?') }}",
"title": "{{ _('How abundant are my microbes compared to everyone in American Gut?') }}",
"hovermode": false,
"yaxis": {
"title": "{{ _('Common types of microbes') }}",
Expand Down Expand Up @@ -1555,7 +1555,7 @@
{{ _('Diversity can be measured in a lot of different ways. We measure it by first taking the DNA sequences from your sample and figuring out which Bacteria and Archaea they may have come from. This produces a good estimate of how many of each kind of microbe you have. The measure we use, called Shannon\'s index, takes into account how many different kinds of microbes make up your skin community (also known as richness) and how relatively abundant each of those microbes are (also known as evenness).') }}
</p>
<p class="site_specific_content site_specific_content_gut">
{{ _('This number isn\'t exact for many reasons. However, because it\'s calculated in the same way for every sample in our dataset, it provides insight into how your microbial diversity compares to others\'. For example, the <span id="average-us-tooltip" class="orange-text" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="top" title="Based on fecal samples from Microsetta participants in the United States">average</span> diversity value for people living in the US in our dataset is <strong id="average-american-observed-average-gut">FILLIN</strong>, which is lower than we find in people living a more hunter-gatherer lifestyle like the <span id="taxa-tooltip" class="orange-text" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="top" title="The Hadza are an indigenous hunter-gather group in Tanzania. The summary of the Hadza microbiome is based on Smits et al. Science 2017">Hadza</span> people of Tanzania, who have an average value of <strong id="average-hadza-observed-average">FILLIN</strong>. ') }}
{{ _('This number isn\'t exact for many reasons. However, because it\'s calculated in the same way for every sample in our dataset, it provides insight into how your microbial diversity compares to others\'. For example, the <span id="average-us-tooltip" class="orange-text" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="top" title="Based on fecal samples from American Gut participants in the United States">average</span> diversity value for people living in the US in our dataset is <strong id="average-american-observed-average-gut">FILLIN</strong>, which is lower than we find in people living a more hunter-gatherer lifestyle like the <span id="taxa-tooltip" class="orange-text" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="top" title="The Hadza are an indigenous hunter-gather group in Tanzania. The summary of the Hadza microbiome is based on Smits et al. Science 2017">Hadza</span> people of Tanzania, who have an average value of <strong id="average-hadza-observed-average">FILLIN</strong>. ') }}
</p>
<p class="site_specific_content site_specific_content_skin">
{{ _('This number isn\'t exact for many reasons. However, because it\'s calculated in the same way for every sample in our dataset, it provides insight into how your microbial diversity compares to others\'. For example, the <span id="average-us-tooltip" class="orange-text" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="top" title="Based on cheek samples from participants in the United States">average</span> diversity value for people living in the US in our dataset is <strong id="average-american-observed-average-skin">FILLIN</strong>.') }}
Expand Down
2 changes: 1 addition & 1 deletion microsetta_interface/templates/opt_out.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{% if not_found %}
<div class="card-body">
<center>
{{ _('Sorry, we could not complete the request. Please email <a href="mailto:microsetta@ucsd.edu">microsetta@ucsd.edu</a> with the email address you signed up with so we can remove you from our list.') }}
{{ _('Sorry, we could not complete the request. Please email <a href="mailto:americangut@ucsd.edu">americangut.ucsd.edu</a> with the email address you signed up with so we can remove you from our list.') }}
</center>
</div>
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion microsetta_interface/templates/sample.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
<button class="btn btn-white-red-border m-2" name="remove_button" onClick="return verifyDissociateSample();">{{ _('Remove') }}</button>
{% endif %}
{% if sample.sample_edit_locked and not admin_mode %}
<span class="kit-tooltip-text">{{ _('Your sample has been received by our lab and can no longer be edited. Please <a href="mailto:microsetta@ucsd.edu">contact us</a> with any questions.') }}</span>
<span class="kit-tooltip-text">{{ _('Your sample has been received by our lab and can no longer be edited. Please <a href="mailto:americangut@ucsd.edu">contact us</a> with any questions.') }}</span>
{% else %}
<button class="btn btn-white-blue-border m-2" name="cancel_button" onClick="return goToKits();">{{ _('Cancel') }}</button>
{% if (not need_reconsent_data and not need_reconsent_biospecimen) or admin_mode %}
Expand Down
10 changes: 5 additions & 5 deletions microsetta_interface/templates/sitebase.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>{{ _('Microsetta') }} - {{page_title}}</title>
<title>{{ _('American Gut') }} - {{page_title}}</title>

<link href="/static/vendor/bootstrap-5.0.2-dist/css/bootstrap.min.css" rel="stylesheet">

Expand Down Expand Up @@ -110,7 +110,7 @@

</div>
<div class="modal-footer tip-modal-footer">
<span class="tip-contact">{{ _('Can\'t find what you\'re looking for?') }} <a href="mailto:microsetta@ucsd.edu" style="text-decoration: none;">{{ _('Please let us know') }}</a>.</span>
<span class="tip-contact">{{ _('Can\'t find what you\'re looking for?') }} <a href="mailto:americangut@ucsd.edu" style="text-decoration: none;">{{ _('Please let us know') }}</a>.</span>
<button type="button" class="btn btn-white-blue-border" id="tips_cancel" onClick="hideModalSiteBase();">{{ _('Close') }}</button>
</div>
</div>
Expand Down Expand Up @@ -140,7 +140,7 @@
{% endif %}
{% if not admin_mode and not hide_header %}
<nav class="navbar fixed-top navbar-light bg-white shadow">
<a class="navbar-brand" href="/home" title="microsetta.ucsd.edu">
<a class="navbar-brand" href="/home" title="americangut.ucsd.edu">
<img src="/static/img/logo-co-agp.png" class="logo-co"/>
</a>
{% if show_tips_icon %}
Expand Down Expand Up @@ -285,9 +285,9 @@
<div class="container">
<div class="d-flex justify-content-center">
{% if not disable_faq %}
<a style="background-image: url('/static/img/icon-question-mark.svg')" href="https://microsetta.ucsd.edu/participant-resources/faqs/" target="_blank" class="tmi-icon m-3">{{ _('FAQs') }}</a>
<a style="background-image: url('/static/img/icon-question-mark.svg')" href="https://americangut.ucsd.edu/participant-resources/faqs/" target="_blank" class="tmi-icon m-3">{{ _('FAQs') }}</a>
{% endif %}
<a style="background-image: url('/static/img/icon-email.svg')" href="mailto:microsetta@ucsd.edu" class="tmi-icon m-3">{{ _('Email') }}</a>
<a style="background-image: url('/static/img/icon-email.svg')" href="mailto:americangut@ucsd.edu" class="tmi-icon m-3">{{ _('Email') }}</a>
{# <a style="background-image: url('/static/img/icon-phone.svg')" href="tel:858-246-5690" class="cta icon -phone">858-246-5690</a>#}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions microsetta_interface/templates/submit_interest.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,10 @@ $(document).ready(function(){
<center>
{% if campaign_id is none %}
{{ _('Sorry, it appears you\'ve followed a bad link. If you were trying to sign up for a project, please try copying the link again.') }}<br /><br />
{{ _('Otherwise, please visit our <a href="https://microsetta.ucsd.edu/">website</a> to learn about other opportunities to participate in the American Gut Project.') }}
{{ _('Otherwise, please visit our <a href="https://americangut.ucsd.edu/">website</a> to learn about other opportunities to participate in the American Gut Project.') }}
{% elif not valid_campaign %}
{{ _('Sorry, due to widespread interest, the sign-up list for this project is full.') }}<br /><br />
{{ _('Please visit our <a href="https://microsetta.ucsd.edu/">website</a> to learn about other opportunities to participate in the American Gut Project.') }}
{{ _('Please visit our <a href="https://americangut.ucsd.edu/">website</a> to learn about other opportunities to participate in the American Gut Project.') }}
{% else %}
<div id="validation_modal" class="val_modal">
<div class="val_modal_content">
Expand Down
4 changes: 2 additions & 2 deletions microsetta_interface/templates/update_address.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ $(document).ready(function(){
</div>
<div id="sorry_modal" class="val_modal">
<div class="val_modal_content">
<div id="sorry_modal_content">{{ _('Sorry, it appears you are having trouble verifying your address. Please contact our support team at microsetta@ucsd.edu and they can assist with confirming your address.') }}</div>
<div id="sorry_modal_content">{{ _('Sorry, it appears you are having trouble verifying your address. Please contact our support team at americangut.ucsd.edu and they can assist with confirming your address.') }}</div>
</div>
</div>
<p class="tmi-content">
Expand All @@ -193,7 +193,7 @@ $(document).ready(function(){
<p class="tmi-content">{{ error |e }}</p>
{% endfor %}
<p class="tmi-content">
{{ _('If you believe this is in error or need assistance correcting your address, please contact us at <a href="mailto:microsetta@ucsd.edu">microsetta@ucsd.edu</a>.') }}
{{ _('If you believe this is in error or need assistance correcting your address, please contact us at <a href="mailto:americangut@ucsd.edu">americangut.ucsd.edu</a>.') }}
</p>
<div class="card card-account" style="max-width: 800px; text-align: left;">
<h5 class="card-header" style="text-align: center">{{ _('Update Your Address') }}</h5>
Expand Down
2 changes: 1 addition & 1 deletion microsetta_interface/tests/test_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def _first_ids_from_html(self, page):
def assertPageTitle(self, resp, title, exp_code=200):
self.assertEqual(resp.status_code, exp_code)
data = self._html_page(resp)
self.assertIn(f'<title>Microsetta - {title}</title>', data)
self.assertIn(f'<title>American Gut - {title}</title>', data)

def assertPageContains(self, resp, string):
data = self._html_page(resp)
Expand Down
14 changes: 7 additions & 7 deletions microsetta_interface/translations/en_US/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2273,7 +2273,7 @@ msgstr ""
#: templates/new_results_page.jinja2:345
msgid ""
"In this map, we've placed your sample relative to all the other samples "
"we have in Microsetta. As you can see, there are a few different types of"
"we have in American Gut. As you can see, there are a few different types of"
" samples people have contributed, and the microbial configurations "
"present can be VERY different."
msgstr ""
Expand Down Expand Up @@ -2455,7 +2455,7 @@ msgid "My Sample"
msgstr ""

#: templates/new_results_page.jinja2:1238
msgid "How abundant are my microbes compared everyone in Microsetta?"
msgid "How abundant are my microbes compared to everyone in American Gut?"
msgstr ""

#: templates/new_results_page.jinja2:1241
Expand Down Expand Up @@ -2612,7 +2612,7 @@ msgid ""
"insight into how your microbial diversity compares to others'. For "
"example, the <span id=\"average-us-tooltip\" class=\"orange-text\" data-"
"bs-toggle=\"tooltip\" data-bs-html=\"true\" data-bs-placement=\"top\" "
"title=\"Based on fecal samples from Microsetta participants in the United"
"title=\"Based on fecal samples from American Gut participants in the United"
" States\">average</span> diversity value for people living in the US in "
"our dataset is <strong id=\"average-american-observed-average-"
"gut\">FILLIN</strong>, which is lower than we find in people living a "
Expand Down Expand Up @@ -3359,7 +3359,7 @@ msgid "Date Signed"
msgstr ""

#: templates/sitebase.jinja2:6
msgid "Microsetta"
msgid "American Gut"
msgstr ""

#: templates/sitebase.jinja2:41
Expand Down Expand Up @@ -3875,7 +3875,7 @@ msgstr ""
#~ msgid ""
#~ "In this map, we've placed your "
#~ "sample relative to all the other "
#~ "samples we have in Microsetta. As "
#~ "samples we have in American Gut. As "
#~ "you can see, there are a few "
#~ "different types of samples people have"
#~ " contributed, and the microbial "
Expand Down Expand Up @@ -3995,7 +3995,7 @@ msgstr ""
#~ "with your eyes. The <span id"
#~ "=\"average-us-tooltip\" class=\"tooltipper\" "
#~ "data-title=\"Based on fecal samples from"
#~ " Microsetta participants in the United "
#~ " American Gut participants in the United "
#~ "States\">average</span> American has <strong "
#~ "id=\"average-american-observed-"
#~ "otus\">FILLIN</strong> different types of "
Expand Down Expand Up @@ -4258,7 +4258,7 @@ msgstr ""
#~ "=\"orange-text\" data-bs-toggle=\"tooltip\" "
#~ "data-bs-html=\"true\" data-bs-"
#~ "placement=\"top\" title=\"Based on fecal "
#~ "samples from Microsetta participants in "
#~ "samples from American Gut participants in "
#~ "the United States\">average</span> diversity "
#~ "value for people living in the US"
#~ " in our dataset is <strong id"
Expand Down
Loading
Loading