Replace 'The Microsetta Initiative'/'TMI' with 'American Gut Project'…

microsetta_interface/templates/home.jinja2

@@ -30,7 +30,7 @@
                       {% if request.args.get('project') == 'sbi' %}
                           <img class="sbi-logo" src="/static/img/sbi-logo.png" alt="Skin Biome Initiative Logo" />
                       {% else %}
-                          <img src="/static/img/{{ _(EN_US_KEY) }}/the-microsetta-initiative-logo-rgb-1.png"  srcset="/static/img/{{ _(EN_US_KEY) }}/the-microsetta-initiative-logo-rgb-1@2x.png 2x, /static/img/{{ _(EN_US_KEY) }}/the-microsetta-initiative-logo-rgb-1@3x.png 3x" />
+                          <img src="/static/img/american-gut-project-logo-rgb-1.png"  srcset="/static/img/american-gut-project-logo-rgb-1@2x.png 2x, /static/img/american-gut-project-logo-rgb-1@3x.png 3x" />
                       {% endif %}
                   </div>
 

microsetta_interface/templates/new_results_page.jinja2

@@ -479,14 +479,14 @@
                 break;
             case "tmi-WGS-gut":
                 // Temporary workaround - we're going to add the Hadza study to the info['qiita-study-ids'] variable and alter the label to be more appropriate. Remove this line and the following four lines once contextual studies for WGS gut samples are fully restored.
-                label = '{{ _('The Microsetta Initiative and Comparative Studies') }}';
+                label = '{{ _('the American Gut Project and Comparative Studies') }}';
                 span_id = "#dataset_links_tmi";
                 info['qiita-study-ids'].push("11358");
                 break;
             case "tmi-16S-gut":
             case "tmi-WGS-skin":
             case "tmi-16S-skin":
-                label = '{{ _('The Microsetta Initiative') }}';
+                label = '{{ _('the American Gut Project') }}';
                 span_id = "#dataset_links_tmi";
                 break;
             case "multipop-16S-gut":

microsetta_interface/templates/nutrition.jinja2

@@ -211,7 +211,7 @@
                         <div class="col-12 text-center">
                             <div class="kit_id_container">
                                 <label for="ffq_code" name="ffq_code_name" class="tmi-content">{{ _('Registration Code') }}:</label><br />
-                                <input type="text" name="ffq_code" id="ffq_code" class="form-control" placeholder="TMI-XXXXX-XXXXX-XXXXX" />
+                                <input type="text" name="ffq_code" id="ffq_code" class="form-control" placeholder="AGP-XXXXX-XXXXX-XXXXX" />
                                 <label for="ffq_code" class="error kit-validation-error" style="display: none"></label>
                             </div>
                         </div>

microsetta_interface/templates/sample_results.jinja2

@@ -160,14 +160,14 @@
   <div class="column" style="text-align: center">
     <h3>{{ _('Alpha Diversity') }}</h3>
     <br>
-    <p>{{ _('Here, we\'re providing a measure of the diversity of your sample, and how it compares to the diversities of all of the same type of samples in The Microsetta Initiative. There are many ways to calculate diversity. For instance, you could compute a diversity value by counting the number of unique organisms observed (i.e., the sample "richness"). Or, you might be interested in weighting the calculation by the relative abundance of the organisms (i.e., the sample "evenness"). The metric we\'re computing here is called Faith\'s Phylogenetic Diversity (originally defined <a href="https://www.sciencedirect.com/science/article/pii/0006320792912013" target="_blank">here</a>). Faith\'s Phylogenetic Diversity computes the "richness" of your sample as the amount of evolutionary breadth represented by your sample. The way we compute alpha diversity is also through <a href="https://qiime2.org" target="_blank">QIIME 2</a>, and more information on it can be found in the alpha and beta diversity <a href="https://docs.qiime2.org/2020.6/tutorials/moving-pictures/#alpha-and-beta-diversity-analysis" target="_blank">sections</a> of the QIIME 2 tutorial') }}.</p> 
+    <p>{{ _('Here, we\'re providing a measure of the diversity of your sample, and how it compares to the diversities of all of the same type of samples in the American Gut Project. There are many ways to calculate diversity. For instance, you could compute a diversity value by counting the number of unique organisms observed (i.e., the sample "richness"). Or, you might be interested in weighting the calculation by the relative abundance of the organisms (i.e., the sample "evenness"). The metric we\'re computing here is called Faith\'s Phylogenetic Diversity (originally defined <a href="https://www.sciencedirect.com/science/article/pii/0006320792912013" target="_blank">here</a>). Faith\'s Phylogenetic Diversity computes the "richness" of your sample as the amount of evolutionary breadth represented by your sample. The way we compute alpha diversity is also through <a href="https://qiime2.org" target="_blank">QIIME 2</a>, and more information on it can be found in the alpha and beta diversity <a href="https://docs.qiime2.org/2020.6/tutorials/moving-pictures/#alpha-and-beta-diversity-analysis" target="_blank">sections</a> of the QIIME 2 tutorial') }}.</p> 
     <div id="vis"></div>
   </div>
 </div>
     <div class="column" style="text-align: center">
     <h3>{{ _('Beta Diversity') }}</h3>
     <br>
-    <p>{{ _('Here we display how your sample fits in among the other samples of The Microsetta Initiative in terms of shared microbes. There are many ways to calculate beta diversity, differing in how to weight the distance between any two microbes. We take evolutionary distance into account with the metric displayed here, known as Unweighted Unifrac. You can find an overview of this metric <a href="https://en.wikipedia.org/wiki/UniFrac" target="_blank">here</a> or better understand its derivation <a href="https://www.ncbi.nlm.nih.gov/pmc/articles/PMC1828774/" target="_blank">here</a>. This computation is performed with <a href="https://qiime2.org" target="_blank">QIIME 2</a>, and more information on it can be found in the alpha and beta diversity <a href="https://docs.qiime2.org/2020.6/tutorials/moving-pictures/#alpha-and-beta-diversity-analysis" target="_blank">sections</a> of the QIIME 2 tutorial') }}.</p>
+    <p>{{ _('Here we display how your sample fits in among the other samples of the American Gut Project in terms of shared microbes. There are many ways to calculate beta diversity, differing in how to weight the distance between any two microbes. We take evolutionary distance into account with the metric displayed here, known as Unweighted Unifrac. You can find an overview of this metric <a href="https://en.wikipedia.org/wiki/UniFrac" target="_blank">here</a> or better understand its derivation <a href="https://www.ncbi.nlm.nih.gov/pmc/articles/PMC1828774/" target="_blank">here</a>. This computation is performed with <a href="https://qiime2.org" target="_blank">QIIME 2</a>, and more information on it can be found in the alpha and beta diversity <a href="https://docs.qiime2.org/2020.6/tutorials/moving-pictures/#alpha-and-beta-diversity-analysis" target="_blank">sections</a> of the QIIME 2 tutorial') }}.</p>
     <div id='emperor-notebook' style="position: relative; width:100%; height:500px;"></div>
   </div>
 {% endblock %}

microsetta_interface/templates/sitebase.jinja2

@@ -141,7 +141,7 @@
     {% 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">
-            <img src="/static/img/logo-co.png" class="logo-co"/>
+            <img src="/static/img/logo-co-agp.png" class="logo-co"/>
         </a>
         {% if show_tips_icon %}
             <a href="#" onClick="return openModalSiteBase();">

microsetta_interface/templates/submit_interest.jinja2

@@ -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 Microsetta Initiative.') }}
+        {{ _('Otherwise, please visit our <a href="https://microsetta.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 Microsetta Initiative.') }}
+        {{ _('Please visit our <a href="https://microsetta.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">
@@ -593,7 +593,7 @@ $(document).ready(function(){
                     </fieldset>
                     <fieldset id="submit_interest_4">
                         <div class="form-group">
-                            <label for="confirm_consent" name="confirm_consent_label">{{ _('By subscribing to this program, I agree to receive communications via the newsletter regarding the status of the program, the steps I must complete, tips and tricks for completing my participation and surveys. I agree and understand that I can unsubscribe at any time using a link in the newsletter and this will not change my consent to receive sample status updates directly from the TMI database. ') }}*</label><br />
+                            <label for="confirm_consent" name="confirm_consent_label">{{ _('By subscribing to this program, I agree to receive communications via the newsletter regarding the status of the program, the steps I must complete, tips and tricks for completing my participation and surveys. I agree and understand that I can unsubscribe at any time using a link in the newsletter and this will not change my consent to receive sample status updates directly from the AGP database. ') }}*</label><br />
                             <input type="checkbox" name="confirm_consent" value="true"> {{ _('Yes') }}
                             <label for="confirm_consent" class="error" style="display: none;">{{ _('Please agree to receiving communications from us.') }}</label>
                         </div>

microsetta_interface/translations/en_US/LC_MESSAGES/messages.po

@@ -2326,11 +2326,11 @@ msgid ""
 msgstr ""
 
 #: templates/new_results_page.jinja2:482
-msgid "The Microsetta Initiative and Comparative Studies"
+msgid "the American Gut Project and Comparative Studies"
 msgstr ""
 
 #: templates/new_results_page.jinja2:489
-msgid "The Microsetta Initiative"
+msgid "the American Gut Project"
 msgstr ""
 
 #: templates/new_results_page.jinja2:516
@@ -3301,8 +3301,8 @@ msgstr ""
 #: templates/sample_results.jinja2:163
 msgid ""
 "Here, we're providing a measure of the diversity of your sample, and how "
-"it compares to the diversities of all of the same type of samples in The "
-"Microsetta Initiative. There are many ways to calculate diversity. For "
+"it compares to the diversities of all of the same type of samples in the "
+"American Gut Project. There are many ways to calculate diversity. For "
 "instance, you could compute a diversity value by counting the number of "
 "unique organisms observed (i.e., the sample \"richness\"). Or, you might "
 "be interested in weighting the calculation by the relative abundance of "
@@ -3325,8 +3325,8 @@ msgstr ""
 
 #: templates/sample_results.jinja2:170
 msgid ""
-"Here we display how your sample fits in among the other samples of The "
-"Microsetta Initiative in terms of shared microbes. There are many ways to"
+"Here we display how your sample fits in among the other samples of the "
+"American Gut Project in terms of shared microbes. There are many ways to"
 " calculate beta diversity, differing in how to weight the distance "
 "between any two microbes. We take evolutionary distance into account with"
 " the metric displayed here, known as Unweighted Unifrac. You can find an "
@@ -3653,7 +3653,7 @@ msgstr ""
 msgid ""
 "Otherwise, please visit our <a "
 "href=\"https://microsetta.ucsd.edu/\">website</a> to learn about other "
-"opportunities to participate in The Microsetta Initiative."
+"opportunities to participate in the American Gut Project."
 msgstr ""
 
 #: templates/submit_interest.jinja2:303
@@ -3665,8 +3665,8 @@ msgstr ""
 #: templates/submit_interest.jinja2:304
 msgid ""
 "Please visit our <a href=\"https://microsetta.ucsd.edu/\">website</a> to "
-"learn about other opportunities to participate in The Microsetta "
-"Initiative."
+"learn about other opportunities to participate in the American Gut "
+"Project."
 msgstr ""
 
 #: templates/submit_interest.jinja2:308 templates/update_address.jinja2:181
@@ -3747,7 +3747,7 @@ msgid ""
 "complete, tips and tricks for completing my participation and surveys. I "
 "agree and understand that I can unsubscribe at any time using a link in "
 "the newsletter and this will not change my consent to receive sample "
-"status updates directly from the TMI database. "
+"status updates directly from the AGP database. "
 msgstr ""
 
 #: templates/submit_interest.jinja2:602 templates/survey.jinja2:299

microsetta_interface/translations/es_ES/LC_MESSAGES/messages.po

@@ -2467,12 +2467,12 @@ msgstr ""
 "polvo se compone de hasta un 50%% de las células muertas de la piel."
 
 #: templates/new_results_page.jinja2:482
-msgid "The Microsetta Initiative and Comparative Studies"
-msgstr "The Microsetta Initiative y los estudios comparativos"
+msgid "the American Gut Project and Comparative Studies"
+msgstr "the American Gut Project y los estudios comparativos"
 
 #: templates/new_results_page.jinja2:489
-msgid "The Microsetta Initiative"
-msgstr "The Microsetta Initiative"
+msgid "the American Gut Project"
+msgstr "the American Gut Project"
 
 #: templates/new_results_page.jinja2:516
 msgid "Publication link"
@@ -3742,8 +3742,8 @@ msgstr "Diversidad Alfa"
 #: templates/sample_results.jinja2:163
 msgid ""
 "Here, we're providing a measure of the diversity of your sample, and how "
-"it compares to the diversities of all of the same type of samples in The "
-"Microsetta Initiative. There are many ways to calculate diversity. For "
+"it compares to the diversities of all of the same type of samples in the "
+"American Gut Project. There are many ways to calculate diversity. For "
 "instance, you could compute a diversity value by counting the number of "
 "unique organisms observed (i.e., the sample \"richness\"). Or, you might "
 "be interested in weighting the calculation by the relative abundance of "
@@ -3761,7 +3761,7 @@ msgid ""
 msgstr ""
 "Aquí, nosotros estamos proporcionamos una medida de la diversidad de su "
 "muestra, y cómo se compara con las diversidades de todos los mismos tipos"
-" de muestras en The Microsetta Initiative. Hay muchas formas de calcular "
+" de muestras en the American Gut Project. Hay muchas formas de calcular "
 "la diversidad. Por ejemplo, usted podría calcular un valor de diversidad "
 "contando el número de organismos únicos observados (es decir, la "
 "“riqueza” de la muestra). O bien, podría estar interesado en ponderar el "
@@ -3785,8 +3785,8 @@ msgstr "Diversidad Beta"
 
 #: templates/sample_results.jinja2:170
 msgid ""
-"Here we display how your sample fits in among the other samples of The "
-"Microsetta Initiative in terms of shared microbes. There are many ways to"
+"Here we display how your sample fits in among the other samples of the "
+"American Gut Project in terms of shared microbes. There are many ways to"
 " calculate beta diversity, differing in how to weight the distance "
 "between any two microbes. We take evolutionary distance into account with"
 " the metric displayed here, known as Unweighted Unifrac. You can find an "
@@ -3801,7 +3801,7 @@ msgid ""
 " 2 tutorial"
 msgstr ""
 "Aquí nosotros mostramos cómo se sitúa su muestra entre las otras muestras"
-" de la Iniciativa Microsetta en términos de microbios compartidos. Hay "
+" de the American Gut Project en términos de microbios compartidos. Hay "
 "muchas formas de calcular la diversidad beta, difiriendo en cómo medir la"
 " distancia entre dos microbios. Nosotros, tomamos en cuenta la distancia "
 "evolutiva con la métrica que se muestra aquí, conocida como Unweighted "
@@ -4173,11 +4173,11 @@ msgstr ""
 msgid ""
 "Otherwise, please visit our <a "
 "href=\"https://microsetta.ucsd.edu/\">website</a> to learn about other "
-"opportunities to participate in The Microsetta Initiative."
+"opportunities to participate in the American Gut Project."
 msgstr ""
 "De lo contrario, por favor visite nuestra <a "
 "href=\"https://microsetta.ucsd.edu/\">página web</a> para conocer acerca "
-"de otras oportunidades para participar en The Microsetta Initiative."
+"de otras oportunidades para participar en the American Gut Project."
 
 #: templates/submit_interest.jinja2:303
 msgid ""
@@ -4190,12 +4190,12 @@ msgstr ""
 #: templates/submit_interest.jinja2:304
 msgid ""
 "Please visit our <a href=\"https://microsetta.ucsd.edu/\">website</a> to "
-"learn about other opportunities to participate in The Microsetta "
-"Initiative."
+"learn about other opportunities to participate in the American Gut "
+"Project."
 msgstr ""
 "Por favor visite nuestro <a href=\"https://microsetta.ucsd.edu/\">sitio "
-"web</a> para conocer otras oportunidades para participar en The "
-"Microsetta Initiative."
+"web</a> para conocer otras oportunidades para participar en the "
+"American Gut Project."
 
 #: templates/submit_interest.jinja2:308 templates/update_address.jinja2:181
 msgid "Verifying your information, please wait just a moment."
@@ -4285,15 +4285,15 @@ msgid ""
 "complete, tips and tricks for completing my participation and surveys. I "
 "agree and understand that I can unsubscribe at any time using a link in "
 "the newsletter and this will not change my consent to receive sample "
-"status updates directly from the TMI database. "
+"status updates directly from the AGP database. "
 msgstr ""
 "Al suscribirme al programa THDMI, acepto recibir comunicaciones a través "
 "del boletín informativo sobre el estado del programa, los pasos que debo "
 "completar, consejos para completar mi participación y encuestas. Yo "
 "acepto y entiendo que puedo cancelar mi suscripción en cualquier momento "
 "usando un enlace en el boletín informativo y esto no cambiará mi "
 "consentimiento para recibir actualizaciones del estado de mi muestra "
-"directamente desde la base de datos de TMI. "
+"directamente desde la base de datos de AGP. "
 
 #: templates/submit_interest.jinja2:602 templates/survey.jinja2:299
 #: templates/survey.jinja2:330