Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
CorwinAnsley committed Sep 5, 2024
2 parents a2bd410 + af54d7b commit a6f681a
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion artifice/artifice_core/language.py
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ def get_translate_scheme(filepath = './resources/translation_scheme.csv'):
return scheme_list

# Takes text (in english) and returns version in given language if translation in scheme
def translate_text(string: str, language: str, scheme_list = None, append_scheme = True, multi_line_fix = True, #<- splits translated string if there's multiple lines
def translate_text(string: str, language: str, scheme_list = None, append_scheme = False, multi_line_fix = True, #<- splits translated string if there's multiple lines
vb = False):
if scheme_list == None or append_scheme:
scheme_list = get_translate_scheme()
2 changes: 1 addition & 1 deletion artifice/environment.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ dependencies:
- pip=21.2.4
- pip:
- Pillow==9.0.1
- PySimpleGUI==4.60.3 #4.55.1
- PySimpleGUI==4.60.5 #4.55.1
- docker==6.1.2
- requests==2.27.1
- pyyaml==6.0
1 change: 1 addition & 0 deletions artifice/resources/translation_scheme.csv
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@ Starting up..,Départ...
Docker software installed,le logiciel Docker est installé
RAMPART software not installed,le logiciel RAMPART n'est pas installé
PIRANHA software installed,le logiciel PIRANHA est installé
PIRANHA software not installed,le logiciel PIRANHA n'est pas installé
Check for updates to PIRANHA software,Vérifier les mises à jour de le logiciel PIRANHA
An internet connection and a Docker install is required to install or update software,Une connexion internet et un installation Docker est nécessaire pour installer ou il faut mettre à jours les logiciels
Docker is free software used to install and run the analysis pipelines.,Docker est un logiciel gratuit utilisé pour installer et lancer les pipelines d'analyse

0 comments on commit a6f681a

Please sign in to comment.