Skip to content

Commit

Permalink
[frontend/i18n] check for empty strings (#979)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexandreDoneux committed Dec 8, 2023
1 parent b96d4ee commit 2e692aa
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions inginious/common/tasks_problems.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ def parse_problem(self, problem_content):
def get_translation_obj(self, language=None):
return self._translations.get(language, gettext.NullTranslations())

def gettext(self, language, *args, **kwargs):
return self.get_translation_obj(language).gettext(*args, **kwargs)
def gettext(self, language, text):
return self.get_translation_obj(language).gettext(text)if text else ""


class CodeProblem(Problem):
Expand Down
4 changes: 2 additions & 2 deletions inginious/frontend/courses.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ def __init__(self, courseid, content, course_fs, task_factory, plugin_manager, t
def get_translation_obj(self, language):
return self._translations.get(language, gettext.NullTranslations())

def gettext(self, language, *args, **kwargs):
return self.get_translation_obj(language).gettext(*args, **kwargs)
def gettext(self, language, text):
return self.get_translation_obj(language).gettext(text) if text else ""

def get_id(self):
""" Return the _id of this course """
Expand Down
4 changes: 2 additions & 2 deletions inginious/frontend/l10n_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ def get_translation_obj(self, lang=None):
lang = self._session.get("language", "") if flask.has_app_context() else ""
return self.translations.get(lang, gettext.NullTranslations())

def gettext(self, *args, **kwargs):
return self.get_translation_obj().gettext(*args, **kwargs)
def gettext(self, text):
return self.get_translation_obj().gettext(text) if text else ""
4 changes: 2 additions & 2 deletions inginious/frontend/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ def __init__(self, course, taskid, content, filesystem, plugin_manager, task_pro
def get_translation_obj(self, language):
return self._translations.get(language, gettext.NullTranslations())

def gettext(self, language, *args, **kwargs):
return self.get_translation_obj(language).gettext(*args, **kwargs)
def gettext(self, language, text):
return self.get_translation_obj(language).gettext(text) if text else ""

def input_is_consistent(self, task_input, default_allowed_extension, default_max_size):
""" Check if an input for a task is consistent. Return true if this is case, false else """
Expand Down

0 comments on commit 2e692aa

Please sign in to comment.