Просмотр исходного кода

Maintenance: Improve translatable source strings.

Martin Gruner 2 лет назад
Родитель
Сommit
9020a7281e

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

@@ -15,7 +15,7 @@ class GettingStartedBase extends App.ControllerWizardFullScreen
       return
       return
 
 
     # set title
     # set title
-    @title __('Configure Base')
+    @title __('Configure Basic Settings')
 
 
     @fetch()
     @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)
         return if !_.include([401, 403, 404, 422, 502], xhr.status)
 
 
         @bodyModal = new App.ControllerTechnicalErrorModal(
         @bodyModal = new App.ControllerTechnicalErrorModal(
-          head:        __('Cannot generate report')
+          head:        __('The report could not be generated')
           contentCode: xhr.responseJSON.error
           contentCode: xhr.responseJSON.error
         )
         )
       success: (data) =>
       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
 =end
 
 
   def self.load(locale)
   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?
     return if !TextModule.count.zero?
 
 

+ 21 - 21
i18n/zammad.pot

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

+ 3 - 3
lib/telegram.rb

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