From c6b14520a6651c2f4c7243cfd087fce63f7183cd Mon Sep 17 00:00:00 2001 From: Jakob Lerch Date: Fri, 13 Aug 2021 16:56:20 +0200 Subject: [PATCH 1/2] updated readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 37188e1..1cdfffa 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,4 @@ Git-Workflow * branch `master` is protected * changes are pushed into branch `dev` +* merge requests can then be created from `dev` into `master`, they are only merged if the project in `dev` is fully functional -- GitLab From 5e0f0b02863d62fd94d7742b582dc67ff816ee0f Mon Sep 17 00:00:00 2001 From: Jakob Lerch Date: Fri, 13 Aug 2021 16:56:43 +0200 Subject: [PATCH 2/2] updated help message of bot --- translate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translate.py b/translate.py index 7e48c2e..d4768b2 100644 --- a/translate.py +++ b/translate.py @@ -8,7 +8,7 @@ class Translator(Plugin): def __init__(self): super().__init__() - self.handle_command_translate.docstring = "translate an own post. Syntax: !tr  " + self.handle_command_translate.docstring = "translate an own post. Syntax: !tr  ; e.g. '!tr en de I am a happy text.' will be translated from english to german." # self.handle_command_translate_thread.docstring = "translate a thread. Answer to a message of the thread you want to translate. Arguments: `` ``" @listen_to(r"\A!tr ") -- GitLab