Browse Source

Maintenance: Improve translatable source strings.

Martin Gruner 2 years ago
parent
commit
9020a7281e

+ 1 - 1
app/assets/javascripts/app/controllers/getting_started/base.coffee

@@ -15,7 +15,7 @@ class GettingStartedBase extends App.ControllerWizardFullScreen
       return
 
     # set title
-    @title __('Configure Base')
+    @title __('Configure Basic Settings')
 
     @fetch()
 

+ 1 - 1
app/assets/javascripts/app/controllers/report.coffee

@@ -175,7 +175,7 @@ class Graph extends App.Controller
         return if !_.include([401, 403, 404, 422, 502], xhr.status)
 
         @bodyModal = new App.ControllerTechnicalErrorModal(
-          head:        __('Cannot generate report')
+          head:        __('The report could not be generated')
           contentCode: xhr.responseJSON.error
         )
       success: (data) =>

+ 1 - 1
app/models/text_module.rb

@@ -28,7 +28,7 @@ import text modules from i18n/text_modules/*.yml if no text modules exist yet.
 =end
 
   def self.load(locale)
-    raise __('Got no locale') if locale.blank?
+    raise __("The required parameter 'locale' is missing.") if locale.blank?
 
     return if !TextModule.count.zero?
 

+ 21 - 21
i18n/zammad.pot

@@ -1206,10 +1206,6 @@ msgstr ""
 msgid "Boolean field"
 msgstr ""
 
-#: lib/telegram.rb
-msgid "Bot already exists!"
-msgstr ""
-
 #: app/assets/javascripts/app/views/telegram/index.jst.eco
 msgid "Bots"
 msgstr ""
@@ -1427,10 +1423,6 @@ msgstr ""
 msgid "Cannot follow-up on a closed ticket. Please create a new ticket."
 msgstr ""
 
-#: app/assets/javascripts/app/controllers/report.coffee
-msgid "Cannot generate report"
-msgstr ""
-
 #: app/assets/javascripts/app/lib/app_post/html5_upload.coffee
 msgid "Cannot upload file"
 msgstr ""
@@ -1883,7 +1875,7 @@ msgid "Configure App"
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/getting_started/base.coffee
-msgid "Configure Base"
+msgid "Configure Basic Settings"
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/_plugin/keyboard_shortcuts.coffee
@@ -4379,10 +4371,6 @@ msgstr ""
 msgid "Google Maps"
 msgstr ""
 
-#: app/models/text_module.rb
-msgid "Got no locale"
-msgstr ""
-
 #: app/assets/javascripts/app/controllers/ticket_zoom/highlighter.coffee
 msgid "Green"
 msgstr ""
@@ -4469,10 +4457,6 @@ msgstr ""
 msgid "Group information could not be retrieved, please check your bind user permissions."
 msgstr ""
 
-#: lib/telegram.rb
-msgid "Group invalid!"
-msgstr ""
-
 #: app/models/channel/driver/sms/base.rb
 msgid "Group is invalid!"
 msgstr ""
@@ -4481,10 +4465,6 @@ msgstr ""
 msgid "Group needed in channel definition!"
 msgstr ""
 
-#: lib/telegram.rb
-msgid "Group needed!"
-msgstr ""
-
 #: app/assets/javascripts/app/views/channel/form.jst.eco
 #: db/seeds/settings.rb
 msgid "Group selection for Ticket creation"
@@ -8924,6 +8904,10 @@ msgstr ""
 msgid "The provided token is invalid."
 msgstr ""
 
+#: app/assets/javascripts/app/controllers/report.coffee
+msgid "The report could not be generated"
+msgstr ""
+
 #: app/assets/javascripts/app/views/knowledge_base/delete.coffee
 msgid "The request could not be processed."
 msgstr ""
@@ -8974,10 +8958,22 @@ msgstr ""
 msgid "The required parameter 'current_user_id' is missing."
 msgstr ""
 
+#: lib/telegram.rb
+msgid "The required parameter 'group_id' is invalid."
+msgstr ""
+
+#: lib/telegram.rb
+msgid "The required parameter 'group_id' is missing."
+msgstr ""
+
 #: app/controllers/users_controller.rb
 msgid "The required parameter 'id' is missing."
 msgstr ""
 
+#: app/models/text_module.rb
+msgid "The required parameter 'locale' is missing."
+msgstr ""
+
 #: lib/external_credential/twitter.rb
 msgid "The required parameter 'oauth_token' is missing."
 msgstr ""
@@ -9109,6 +9105,10 @@ msgstr ""
 msgid "Third-party Applications"
 msgstr ""
 
+#: lib/telegram.rb
+msgid "This bot already exists."
+msgstr ""
+
 #: app/assets/javascripts/app/controllers/knowledge_base/reader_list_controller.coffee
 msgid "This category is empty"
 msgstr ""

+ 3 - 3
lib/telegram.rb

@@ -66,16 +66,16 @@ returns
     bot = Telegram.check_token(token)
 
     if !channel && Telegram.bot_duplicate?(bot['id'])
-      raise Exceptions::UnprocessableEntity, __('Bot already exists!')
+      raise Exceptions::UnprocessableEntity, __('This bot already exists.')
     end
 
     if params[:group_id].blank?
-      raise Exceptions::UnprocessableEntity, __('Group needed!')
+      raise Exceptions::UnprocessableEntity, __("The required parameter 'group_id' is missing.")
     end
 
     group = Group.find_by(id: params[:group_id])
     if !group
-      raise Exceptions::UnprocessableEntity, __('Group invalid!')
+      raise Exceptions::UnprocessableEntity, __("The required parameter 'group_id' is invalid.")
     end
 
     # generate random callback token