Merge branch 'develop' into log-scale

Author: BrianThomasRoss

docs/contributing/app-dev.md

@@ -85,6 +85,16 @@ STREAMLIT_SERVER_PORT=1234 \
 PARAMETERS=./defaults/webapp.cfg streamlit run st_app.py
 ```
 
+### Choosing a Different Language
+
+If you want to run the application in another language, do the following. You can select Japanese as the language other than English.
+
+```bash
+ASSETS=./defaults/assets \
+LANG=ja \
+PARAMETERS=./defaults/webapp.cfg streamlit run st_app.py
+```
+
 ## Project Layout
 
 ### Application files

src/penn_chime/locales/en.yml

@@ -4,6 +4,9 @@ en:
   app-admitted-patients-title: "Admitted Patients (Census)"
   app-admitted-patients-text: "Projected **census** of COVID-19 patients, accounting for arrivals and discharges."
   app-PPE-title: "Personal Protective Equipment (PPE) Calculator"
+  app-PPE-screenshot: "Show a screenshot of the tool"
+  app-PPE-documentation: |+
+    Refer to our <a href="{link_to_docs}">user documentation for instructions on how to use the tool</a>.
   app-SIR-title: "Susceptible, Infected, and Recovered"
   app-SIR-text: "The number of susceptible, infected, and recovered individuals in the hospital catchment region at any given moment"
   charts-date: "Date"
@@ -82,6 +85,8 @@ en:
   presentation-copyright: "© 2020, The Trustees of the University of Pennsylvania"
   presentation-download: |+
     <a download="{filename}" href="data:file/csv;base64,{csv}">Download {filename}</a>
+  presentation-excel-download: |+
+    Download the PPE Calculator here: <a download="{filename}" href="data:file/xlsx;base64,{excel}">{filename}</a>.
   admits_hospitalized: "Hospitalized Admissions"
   admits_icu: "ICU Admissions"
   admits_ventilated: "Ventilated Admissions"

src/penn_chime/locales/ja.yml

@@ -3,6 +3,10 @@ ja:
   app-new-admissions-text: "**日毎の**COVID-19関連新規入院患者数予測"
   app-admitted-patients-title: "累計入院患者数"
   app-admitted-patients-text: "入院と退院を考慮したCOVID-19患者の予測**累計患者数**"
+  app-PPE-title: "個人用防護具 (PPE) 計算機"
+  app-PPE-screenshot: "ツールのスクリーンショットを表示"
+  app-PPE-documentation: |+
+    ツールの使い方については<a href="{link_to_docs}">ユーザドキュメントの説明</a>を確認してください。
   app-SIR-title: "感受性保持者、感染者と回復者"
   app-SIR-text: "与えられた時間範囲での、病院の担当範囲領域における感受性保持者、感染者と回復者の人数"
   charts-date: "日付"
@@ -79,6 +83,8 @@ ja:
   presentation-copyright: "© 2020, The Trustees of the University of Pennsylvania"
   presentation-download: |+
     <a download="{filename}" href="data:file/csv;base64,{csv}">{filename} をダウンロード</a>
+  presentation-excel-download: |+
+    個人用防護具計算機のダウンロードはこちら: <a download="{filename}" href="data:file/xlsx;base64,{excel}">{filename}</a>.
   admits_hospitalized: "新規入院患者数"
   admits_icu: "新規集中治療患者数"
   admits_ventilated: "新規人工呼吸患者数"

src/penn_chime/view/st_app.py

@@ -6,8 +6,9 @@
 import streamlit as st
 import i18n
 
+lang = os.environ.get('LANG') or 'en'
 i18n.set('filename_format', '{locale}.{format}')
-i18n.set('locale', 'en')
+i18n.set('locale', lang)
 i18n.set('fallback', 'en')
 i18n.load_path.append(os.path.dirname(__file__) + '/../locales')
 
@@ -27,7 +28,9 @@
     display_sidebar,
     hide_menu_style,
 )
-
+from ..constants import (
+    DOCS_URL,
+)
 
 def main():
     # This is somewhat dangerous:
@@ -77,16 +80,15 @@ def main():
         df=m.ppe_df,
     )
 
-    if st.checkbox("Show a screenshot of the tool"):
+    if st.checkbox(i18n.t("app-PPE-screenshot")):
         st.image(
             image=ppe.screenshot,
             width=600,
             format='JPEG',
         )
-    st.markdown("""
-        Refer to our <a href="{link_to_docs}">user documentation for instructions on how to use the tool</a>.
-    """.format(
-            link_to_docs="https://code-for-philly.gitbook.io/chime/ppe-calculator",
+    st.markdown(
+        i18n.t("app-PPE-documentation").format(
+            link_to_docs="{docs_url}/ppe-calculator".format(docs_url=DOCS_URL),
         ),
         unsafe_allow_html=True
     )

src/penn_chime/view/st_display.py

@@ -476,9 +476,8 @@ def display_download_link(st, p, filename: str, df: pd.DataFrame):
 
 def display_excel_download_link(st, filename: str, src: str):
     excel = excel_to_base64(src)
-    st.markdown("""
-        Download the PPE Calculator here: <a download="{filename}" href="data:file/xlsx;base64,{excel}">{filename}</a>.
-    """.format(
+    st.markdown(
+        i18n.t("presentation-excel-download").format(
             excel=excel, filename=filename
         ),
         unsafe_allow_html=True,