Browse Source

Maintenance: Improve translatable source strings by using ellipsis (…) rather than three dots (...).

Martin Gruner 3 years ago
parent
commit
933e82c06f

+ 1 - 1
app/assets/javascripts/app/controllers/_plugin/maintenance.coffee

@@ -46,7 +46,7 @@ class Maintenance extends App.Controller
   maintanaceRestartAuto: (data) =>
     return if @messageRestartAuto
     @messageRestartAuto = new App.SessionMessage(
-      head:         App.i18n.translateContent('Zammad is restarting...')
+      head:         App.i18n.translateContent('Zammad is restarting')
       message:      App.i18n.translateContent('Some system settings have changed, Zammad is restarting. Please wait until Zammad is back again.')
       keyboard:     false
       backdrop:     false

+ 1 - 1
app/assets/javascripts/app/controllers/_ui_element/autocompletion_ajax.coffee

@@ -13,7 +13,7 @@ class App.UiElement.autocompletion_ajax
         valueName:   valueName
         name:        attribute.name
         id:          params.organization_id || attribute.id
-        placeholder: App.i18n.translateInline('Search...')
+        placeholder: App.i18n.translateInline('Search')
         limit:       40
         object:      attribute.relation
         ajax:        true

+ 1 - 1
app/assets/javascripts/app/controllers/widget/link/kb_answer.coffee

@@ -50,7 +50,7 @@ class App.WidgetLinkKbAnswer extends App.WidgetLink
       attribute:
         id:          'link_kb_answer'
         name:        'input'
-        placeholder: App.i18n.translateInline('Search...')
+        placeholder: App.i18n.translateInline('Search')
         limit:       40
         object:      'KnowledgeBaseAnswerTranslation'
         ajax:        true

+ 2 - 2
app/assets/javascripts/app/lib/app_post/task_manager.coffee

@@ -155,8 +155,8 @@ class _taskManagerSingleton extends App.Controller
       url:       '#'
       id:        false
       iconClass: 'loading'
-      title:     App.i18n.translateInline('Loading...')
-      head:      App.i18n.translateInline('Loading...')
+      title:     App.i18n.translateInline('Loading')
+      head:      App.i18n.translateInline('Loading')
     worker = App.TaskManager.worker(task.key)
     if worker && worker.meta
       data = worker.meta(task)

+ 4 - 4
app/assets/javascripts/app/lib/base/jquery.textmodule.js

@@ -554,7 +554,7 @@
   KbAnswer.renderValue = function(textmodule, elem, callback) {
     textmodule.emptyResultsContainer()
 
-    var element = $('<li>').text(App.i18n.translateInline('Please wait...'))
+    var element = $('<li>').text(App.i18n.translateInline('Please wait'))
     textmodule.appendResults(element)
 
     var form_id = textmodule.$element.closest('form').find('[name=form_id]').val()
@@ -672,7 +672,7 @@
   Mention.renderValue = function(textmodule, elem, callback) {
     textmodule.emptyResultsContainer()
 
-    var element = $('<li>').text(App.i18n.translateInline('Please wait...'))
+    var element = $('<li>').text(App.i18n.translateInline('Please wait'))
     textmodule.appendResults(element)
 
     var form_id = textmodule.$element.closest('form').find('[name=form_id]').val()
@@ -699,13 +699,13 @@
     textmodule.emptyResultsContainer()
 
     if(!term) {
-      var element = $('<li>').text(App.i18n.translateInline('Start typing to search for users...'))
+      var element = $('<li>').text(App.i18n.translateInline('Start typing to search for users'))
       textmodule.appendResults(element)
 
       return
     }
 
-    var element = $('<li>').text(App.i18n.translateInline('Loading...'))
+    var element = $('<li>').text(App.i18n.translateInline('Loading'))
     textmodule.appendResults(element)
 
     App.Delay.set(function() {

+ 1 - 1
app/assets/javascripts/app/views/ticket_zoom/title.jst.eco

@@ -1 +1 @@
-<div contenteditable="true" class="ticket-title-update js-objectTitle" data-placeholder="<%- @Ti('Enter Title...') %>"><%= @object.title || '-' %></div>
+<div contenteditable="true" class="ticket-title-update js-objectTitle" data-placeholder="<%- @Ti('Enter Title') %>"><%= @object.title || '-' %></div>

+ 1 - 1
app/views/init/index.html.erb

@@ -31,5 +31,5 @@
 <div id="app"></div>
 <div class="splash">
   <svg class="icon icon-logo"><use xlink:href="assets/images/icons.svg#icon-logo" /></svg>
-  <div class="splash-title">Loading...</div>
+  <div class="splash-title">Loading</div>
 </div>

+ 1 - 1
app/views/layouts/knowledge_base.html.erb

@@ -35,7 +35,7 @@
       <div class="search">
         <div class="search-field">
           <%= icon 'magnifier' %>
-          <input class="js-search-input" type="search" placeholder="<%= zt('How can we help you? Search for an answer or a topic...') %>">
+          <input class="js-search-input" type="search" placeholder="<%= zt('How can we help you? Search for an answer or a topic') %>">
         </div>
         <ul class="search-results js-search-results" data-empty-placeholder="<%= zt('No results were found.') %>"></ul>
       </div>

+ 7 - 9
i18n/zammad.pot

@@ -3635,7 +3635,7 @@ msgid "Enter Project Name"
 msgstr ""
 
 #: app/assets/javascripts/app/views/ticket_zoom/title.jst.eco
-msgid "Enter Title..."
+msgid "Enter Title"
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/layout_ref.coffee
@@ -4572,7 +4572,7 @@ msgid "Hours"
 msgstr ""
 
 #: app/views/layouts/knowledge_base.html.erb
-msgid "How can we help you? Search for an answer or a topic..."
+msgid "How can we help you? Search for an answer or a topic"
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/_dashboard/stats/ticket_waiting_time.coffee
@@ -5455,11 +5455,12 @@ msgstr ""
 msgid "Load"
 msgstr ""
 
-#: app/assets/javascripts/app/lib/app_post/task_manager.coffee
 #: app/assets/javascripts/app/lib/base/jquery.textmodule.js
 msgid "Loading..."
 msgstr ""
 
+#: app/assets/javascripts/app/lib/app_post/task_manager.coffee
+#: app/assets/javascripts/app/lib/base/jquery.textmodule.js
 #: app/assets/javascripts/app/views/generic/page_loading.jst.eco
 msgid "Loading…"
 msgstr ""
@@ -7188,7 +7189,7 @@ msgid "Please supply your new password!"
 msgstr ""
 
 #: app/assets/javascripts/app/lib/base/jquery.textmodule.js
-msgid "Please wait..."
+msgid "Please wait"
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/_profile/notification.coffee
@@ -7883,9 +7884,6 @@ msgstr ""
 
 #: app/assets/javascripts/app/controllers/_ui_element/autocompletion_ajax.coffee
 #: app/assets/javascripts/app/controllers/widget/link/kb_answer.coffee
-msgid "Search..."
-msgstr ""
-
 #: app/assets/javascripts/app/views/generic/icon_picker.jst.eco
 msgid "Search…"
 msgstr ""
@@ -8410,7 +8408,7 @@ msgid "Start new conversation"
 msgstr ""
 
 #: app/assets/javascripts/app/lib/base/jquery.textmodule.js
-msgid "Start typing to search for users..."
+msgid "Start typing to search for users"
 msgstr ""
 
 #: app/assets/javascripts/app/lib/base/jquery.textmodule.js
@@ -10763,7 +10761,7 @@ msgid "Zammad is currently in maintenance mode. Only administrators can login. P
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/_plugin/maintenance.coffee
-msgid "Zammad is restarting..."
+msgid "Zammad is restarting"
 msgstr ""
 
 #: app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco

+ 1 - 1
test/browser_test_helper.rb

@@ -4409,7 +4409,7 @@ wait untill text in selector disabppears
       browser: instance,
     )
     title_text = instance.find_elements(css: '.modal .modal-title').first.text
-    if ['Zammad is restarting...', 'Zammad requires a restart!'].include?(title_text)
+    if ['Zammad is restarting', 'Zammad requires a restart!'].include?(title_text)
       # in the complex case, wait for server to restart
       modal_disappear(
         browser: instance,