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.

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

Merge i18n into master #172

Merged
merged 113 commits into from
Jun 15, 2021
Merged
Show file tree
Hide file tree
Changes from 99 commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
cbb7c81
Bring in flask-babel
wasade May 4, 2021
b954800
first pass over implementation.py
dhakim87 May 5, 2021
92c6a09
Added in the example flask-babel language/timezone selection with my …
dhakim87 May 5, 2021
9ef40f2
fixed gettext reference, expanded comment above gettext calls for str…
dhakim87 May 5, 2021
6c0b3eb
flake8
dhakim87 May 5, 2021
b3802c0
Fixed annotations to refer to babel the flask-babel object, rather th…
dhakim87 May 5, 2021
edb8f47
Merge pull request #131 from biocore/st_dh_i18n
wasade May 10, 2021
b85f4d5
Moved static images with text to new en_us folder. Translations will…
dhakim87 May 10, 2021
25b785d
Deleted FAQ and associated images so we don't have to translte them
dhakim87 May 10, 2021
7f28c0a
Moved bristol stool chart
dhakim87 May 10, 2021
ad6af98
Merge pull request #135 from biocore/st_dh_i18n
wasade May 10, 2021
fb25e4d
Fix babel.cfg and add messages.pot
cassidysymons May 11, 2021
66682b6
Update jinja2 templates for i18n
cassidysymons May 11, 2021
97fddcd
add scatter to background
gwarmstrong Apr 26, 2021
9392793
Select the dataset
wasade May 6, 2021
c4765fb
add padding above to scatter
gwarmstrong May 10, 2021
0d41601
Merge branch 'i18n' into i18n
cassidysymons May 11, 2021
487674c
restoring scatter
wasade May 6, 2021
9a3bee1
Base translations
wasade May 18, 2021
6d82a65
en_us -> es_mx
wasade May 18, 2021
fb26dc4
Include naive translations for new_results_page
wasade May 18, 2021
7d98767
Use pngs to avoid inconsistencies from Illustrator to browser
wasade May 18, 2021
cc5a460
Edits to choose, store, retrieve preferred language with account. Is…
dhakim87 May 18, 2021
ad02919
__ -> _
wasade May 18, 2021
0662227
Merge pull request #144 from wasade/draft-es_MX
wasade May 18, 2021
565399a
A missing '_'
wasade May 24, 2021
ed9fbc9
Default account language combo box based on browser preference. Matc…
dhakim87 May 25, 2021
9e92026
Merge pull request #150 from wasade/i18n
wasade May 25, 2021
008667e
Localization of sample date field. Introduces a hidden normalized fi…
dhakim87 May 25, 2021
9b45d5e
en-US to en_US everywhere. Hooked browser settings and account langu…
dhakim87 May 25, 2021
b246ac8
Flake8
dhakim87 May 25, 2021
fdf23fe
Merge branch 'i18n' into st_dh_account_lang_chooser
wasade May 25, 2021
a83ab0c
Merge pull request #145 from biocore/st_dh_account_lang_chooser
wasade May 25, 2021
9864fd8
Merge pull request #151 from biocore/st_dh_i18n_datepicker
wasade May 25, 2021
9cdcbe1
Merge branch 'i18n' into st_dh_normalize_lang_tags
wasade May 25, 2021
3b2dab5
Update microsetta_interface/server.py
wasade May 25, 2021
8bc5b61
Workaround for failing unit tests due to not being able to use flask …
dhakim87 May 26, 2021
68bf746
Flake8
dhakim87 May 26, 2021
a963683
Merge pull request #153 from biocore/st_dh_normalize_lang_tags
wasade May 26, 2021
331f354
Template Changes for System Message i18n
cassidysymons May 27, 2021
845856f
System Changes for System Message i18n
cassidysymons May 27, 2021
6cd2df0
Changes for System Message i18n
cassidysymons May 27, 2021
db714fd
Template Changes for System Message i18n
cassidysymons May 27, 2021
6c16408
Update microsetta_interface/implementation.py
cassidysymons May 27, 2021
38ff37e
Update microsetta_interface/implementation.py
cassidysymons May 27, 2021
fdd5593
Update microsetta_interface/implementation.py
cassidysymons May 27, 2021
d2f4e65
Add localized bristol chart
wasade May 25, 2021
3e16392
Handle an id on the bristol chart
wasade May 26, 2021
436ea3a
text revision
wasade May 26, 2021
4d70b20
fix #146, move country selection after zip
wasade May 26, 2021
ad01f4f
Merge pull request #155 from cassidysymons/i18n
wasade May 27, 2021
36742e1
Move country higher on account page
wasade May 28, 2021
f2fc42f
note flask-babel on reqs
wasade May 28, 2021
11c5775
Compile on install
wasade May 28, 2021
e9a1270
use pybabels direct intergration
wasade May 28, 2021
64ee50f
Make sure the jinja2 i18n extension is loaded
wasade May 28, 2021
d80df03
More deploy items
wasade May 28, 2021
43c48d1
move decorators into build app
wasade May 28, 2021
273598f
Fix State Selection for Mexico
cassidysymons Jun 1, 2021
63c50ab
Fix State Selection for Mexico
cassidysymons Jun 1, 2021
a2f7c40
Adding Localization Files for DataTables Plugin
cassidysymons Jun 1, 2021
4ab40e1
Add files via upload
cassidysymons Jun 1, 2021
a18d715
Hacky workaround for the hardcoded ' selected' in vue form generator …
dhakim87 Jun 1, 2021
50286ae
Use ' selected' if _SELECTED is not set, rather than throwing a Refer…
dhakim87 Jun 1, 2021
aeeb3cd
Update microsetta_interface/templates/account_details.jinja2
wasade Jun 1, 2021
cb25d35
Merge pull request #157 from wasade/issues_140_130
wasade Jun 1, 2021
ee9378e
Merge branch 'i18n' into i18n
wasade Jun 1, 2021
7ca0d89
Update microsetta_interface/templates/account_details.jinja2
wasade Jun 1, 2021
3fa5c0f
Update microsetta_interface/templates/account_details.jinja2
wasade Jun 1, 2021
52a365e
Update microsetta_interface/templates/new_results_page.jinja2
wasade Jun 1, 2021
b828fcb
Update microsetta_interface/templates/new_results_page.jinja2
wasade Jun 1, 2021
28ffdef
Update microsetta_interface/templates/new_results_page.jinja2
wasade Jun 1, 2021
d1b8e2e
Merge pull request #159 from cassidysymons/i18n
wasade Jun 1, 2021
b7404c4
Merge pull request #160 from biocore/st_dh_vfg_selectedi18n
wasade Jun 1, 2021
6962d3d
Add files via upload
cassidysymons Jun 1, 2021
94551a7
Add files via upload
cassidysymons Jun 1, 2021
b7a5535
Merge pull request #161 from cassidysymons/i18n
wasade Jun 2, 2021
7f69ccf
Partially resolve #158
wasade Jun 3, 2021
e743bcc
Defined a mechanism for translating dynamic fields with enumerated va…
dhakim87 Jun 4, 2021
31c20b2
Flake8
dhakim87 Jun 4, 2021
a465ae2
Update microsetta_interface/implementation.py
dhakim87 Jun 4, 2021
1bc0676
from model_i18n import, handled None for sample's sample_datetime and…
dhakim87 Jun 4, 2021
6820bed
translated hero image
wasade Jun 4, 2021
86f395a
Merge pull request #163 from wasade/superticket
dhakim87 Jun 4, 2021
9926cd6
Merge pull request #164 from biocore/st_dh_translate_enums
wasade Jun 4, 2021
c7a468f
revised stool charts
wasade Jun 4, 2021
023fd19
Merge pull request #165 from wasade/new-bristol
wasade Jun 4, 2021
c308bd6
new translations
wasade Jun 5, 2021
a1d4122
Merge pull request #167 from wasade/deploy-items-again
wasade Jun 5, 2021
328b64c
fix the image
wasade Jun 5, 2021
f2c23ed
Merge pull request #168 from wasade/deploy-items-bristol
wasade Jun 5, 2021
5585383
fix #162
wasade Jun 5, 2021
e27be38
Remove extraneous spaces
wasade Jun 7, 2021
a810b83
Merge branch 'i18n' of github.com:biocore/microsetta-interface into d…
wasade Jun 7, 2021
03f866d
use proper quote marks
wasade Jun 7, 2021
cf6ebb4
primary questionnaire
wasade Jun 10, 2021
e707010
remove extraneous spaces
wasade Jun 10, 2021
4126d57
Merge pull request #169 from wasade/deploy-again-again
wasade Jun 10, 2021
697ca17
Merge branch 'master' into i18n
wasade Jun 10, 2021
dda05bb
Update ci/pip_requirements.txt
dhakim87 Jun 10, 2021
9584760
Update microsetta_interface/implementation.py
dhakim87 Jun 10, 2021
b67f7c8
Centralized en_us, en_US, es_mx, es_MX and an ordered LANGUAGES dicti…
dhakim87 Jun 10, 2021
a0766a2
flake8
dhakim87 Jun 10, 2021
85ffa8c
Merge branch 'i18n' into st_dh_173
dhakim87 Jun 10, 2021
bbbc6a5
Update microsetta_interface/templates/new_results_page.jinja2
dhakim87 Jun 10, 2021
913f2e0
Update microsetta_interface/templates/new_results_page.jinja2
dhakim87 Jun 10, 2021
77259b2
Update microsetta_interface/translations/es_MX/LC_MESSAGES/messages.po
dhakim87 Jun 10, 2021
23ed158
Merge branch 'i18n' into st_dh_173
dhakim87 Jun 10, 2021
b4b19d0
Whoops
dhakim87 Jun 10, 2021
41ab30f
Used names in named tuple rather than indexes
dhakim87 Jun 10, 2021
bb43d31
minor tweaks
wasade Jun 15, 2021
7af5c72
Merge pull request #177 from wasade/instrution-tweak
wasade Jun 15, 2021
69ae61d
Merge pull request #176 from biocore/st_dh_173
wasade Jun 15, 2021
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
5 changes: 5 additions & 0 deletions babel.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[python: **.py]
[jinja2: **/templates/**.html]
[jinja2: **/templates/**.jinja2]
extensions=jinja2.ext.autoescape,jinja2.ext.with_
silent=false
1 change: 1 addition & 0 deletions ci/conda_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ pycryptodome
redis-py
redis
pytest
flask-babel
1 change: 1 addition & 0 deletions ci/pip_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ pytest-cov
coveralls
pycountry
python-dateutil
flask-babel
dhakim87 marked this conversation as resolved.
Show resolved Hide resolved
Loading