Martin Edenhofer 5 лет назад
Родитель
Сommit
110d60dd30

+ 3 - 3
app/assets/javascripts/app/controllers/_manage/knowledge_base.coffee

@@ -32,7 +32,7 @@ class App.ManageKnowledgeBase extends App.ControllerTabs
     @ajax(
     @ajax(
       id:          'knowledge_bases_init_admin'
       id:          'knowledge_bases_init_admin'
       type:        'GET'
       type:        'GET'
-      url:         @apiPath + '/knowledge_bases/manage/init'
+      url:         "#{@apiPath}/knowledge_bases/manage/init"
       processData: true
       processData: true
       success:     (data, status, xhr) =>
       success:     (data, status, xhr) =>
         App.Collection.loadAssets(data)
         App.Collection.loadAssets(data)
@@ -93,7 +93,7 @@ class App.ManageKnowledgeBase extends App.ControllerTabs
 
 
     @tabs = [
     @tabs = [
       {
       {
-        name:       'Style'
+        name:       'Theme'
         target:     'style'
         target:     'style'
         controller: App.KnowledgeBaseForm
         controller: App.KnowledgeBaseForm
         params:     _.extend({}, params, { screen: 'style', split: true })
         params:     _.extend({}, params, { screen: 'style', split: true })
@@ -117,7 +117,7 @@ class App.ManageKnowledgeBase extends App.ControllerTabs
 
 
     if !App.Config.get('system_online_service')
     if !App.Config.get('system_online_service')
       @tabs.splice(-1, 0, {
       @tabs.splice(-1, 0, {
-        name:       'Custom Address'
+        name:       'Custom URL'
         target:     'custom_address'
         target:     'custom_address'
         controller: App.KnowledgeBaseCustomAddressForm,
         controller: App.KnowledgeBaseCustomAddressForm,
         params:     _.extend({}, params, { screen: 'custom_address' })
         params:     _.extend({}, params, { screen: 'custom_address' })

+ 3 - 3
app/assets/javascripts/app/controllers/knowledge_base/content_can_be_published_form.coffee

@@ -93,7 +93,7 @@ class App.KnowledgeBaseContentCanBePublishedForm extends App.ControllerForm
   model:
   model:
     configure_attributes: [
     configure_attributes: [
         name:    'visibility'
         name:    'visibility'
-        display: 'Visibility'
+        display: 'Permissions'
         tag:     'radio'
         tag:     'radio'
         default: false
         default: false
         options: [
         options: [
@@ -103,7 +103,7 @@ class App.KnowledgeBaseContentCanBePublishedForm extends App.ControllerForm
           ,
           ,
             value: 'internal'
             value: 'internal'
             name:  'Internal'
             name:  'Internal'
-            note:  'Only visible to agents & editors'
+            note:  'Visible to agents & editors'
           ,
           ,
             value: 'published'
             value: 'published'
             name:  'Public'
             name:  'Public'
@@ -119,7 +119,7 @@ class App.KnowledgeBaseContentCanBePublishedForm extends App.ControllerForm
         default: 'now'
         default: 'now'
         options: [
         options: [
             value: 'now'
             value: 'now'
-            name:  'Now'
+            name:  'now'
           ,
           ,
             value: 'scheduled'
             value: 'scheduled'
             name:  'Schedule for'
             name:  'Schedule for'

+ 2 - 2
app/assets/javascripts/app/controllers/knowledge_base/delete_action.coffee

@@ -6,7 +6,7 @@ class App.KnowledgeBaseDeleteAction
     if @object instanceof App.KnowledgeBaseCategory and !@object.isEmpty()
     if @object instanceof App.KnowledgeBaseCategory and !@object.isEmpty()
       @showCannotDelete(
       @showCannotDelete(
         'Cannot delete category',
         'Cannot delete category',
-        'Please delete all children categories and answers first.'
+        'Delete all child categories and answers, then try again.'
       )
       )
 
 
       return
       return
@@ -19,7 +19,7 @@ class App.KnowledgeBaseDeleteAction
 
 
     @dialog = new App.ControllerConfirm(
     @dialog = new App.ControllerConfirm(
       head:      'Delete'
       head:      'Delete'
-      message:   "Are you sure to delete \"#{translation?.title}\"?"
+      message:   "Are you sure you want to delete \"#{translation?.title}\"?"
       callback:  @doDelete
       callback:  @doDelete
       container: @parentController.el
       container: @parentController.el
       onSubmit: ->
       onSubmit: ->

+ 0 - 1
app/assets/javascripts/app/controllers/widget/http_log.coffee

@@ -51,7 +51,6 @@ class Show extends App.ControllerModal
     super
     super
 
 
   content: ->
   content: ->
-    console.log('cont')
     App.view('widget/http_log_show')(
     App.view('widget/http_log_show')(
       record: @record
       record: @record
     )
     )

+ 0 - 1
app/assets/javascripts/app/controllers/widget/ticket_stats.coffee

@@ -161,7 +161,6 @@ class App.TicketStatsList extends App.Controller
       ticket_ids_show = @ticket_ids
       ticket_ids_show = @ticket_ids
 
 
     tickets = (App.Ticket.fullLocal(id) for id in ticket_ids_show)
     tickets = (App.Ticket.fullLocal(id) for id in ticket_ids_show)
-    console.log tickets
 
 
     @html App.view('widget/ticket_stats_list')(
     @html App.view('widget/ticket_stats_list')(
       user:            @user
       user:            @user

+ 1 - 1
app/assets/javascripts/app/lib/app_post/multi_locales_row.coffee

@@ -34,7 +34,7 @@ class App.MultiLocalesRow extends App.Controller
         name:        name
         name:        name
         value:       value
         value:       value
         null:        false
         null:        false
-        placeholder: 'Select locale:'
+        placeholder: 'Select locale...'
         options:     [] #formattedLocales
         options:     [] #formattedLocales
         class:       'form-control--small'
         class:       'form-control--small'
     )
     )

+ 5 - 6
app/assets/javascripts/app/models/knowledge_base.coffee

@@ -128,11 +128,10 @@ class App.KnowledgeBase extends App.Model
           shown: true
           shown: true
     }, {
     }, {
       name: 'color_highlight'
       name: 'color_highlight'
-      display: 'Highlight Color'
+      display: 'Icon & Link Color'
       tag: 'color'
       tag: 'color'
       style: 'block'
       style: 'block'
       null: false
       null: false
-      help: 'The highlight color is used to make elements of the interface stand out. For example the links and icons.'
       screen:
       screen:
         admin_style_color_highlight:
         admin_style_color_highlight:
           display:    false
           display:    false
@@ -199,7 +198,7 @@ class App.KnowledgeBase extends App.Model
       display: 'Icon Set'
       display: 'Icon Set'
       tag:     'iconset_picker'
       tag:     'iconset_picker'
       style:   'block'
       style:   'block'
-      help:    "Pick an iconset that fits your style. The icons from this set can be assigned to categories. Choose wisely because the icon sets don't match with each other. If you change it later on you'll have to reset every icon."
+      help:    'Every category in your knowledge base should be given a unique icon for maximum visual clarity. Each set below provides a wide range of icons to choose from, but beware-you can\'t mix and match different icons from different sets. Choose carefully!'
       null:    false
       null:    false
       screen:
       screen:
         admin_style_iconset:
         admin_style_iconset:
@@ -210,7 +209,7 @@ class App.KnowledgeBase extends App.Model
       tag: 'multi_locales'
       tag: 'multi_locales'
       style: 'block'
       style: 'block'
       null: false
       null: false
-      help: 'Set up the languages for the Knowledge Base. Zammad detects the prefered language of the visitor. When its not available it will fall back to the primary language.'
+      help: 'You can provide different versions of your knowledge base for different locales. Add a language below, then select it in the Knowledge Base Editor to add your translations.'
       screen:
       screen:
         admin_languages:
         admin_languages:
           shown: true
           shown: true
@@ -218,11 +217,11 @@ class App.KnowledgeBase extends App.Model
           shown: true
           shown: true
     }, {
     }, {
       name:    'custom_address'
       name:    'custom_address'
-      display: 'Custom Address'
+      display: 'Custom URL'
       tag:     'input'
       tag:     'input'
       style:   'block'
       style:   'block'
       null:    true
       null:    true
-      help:    'Fill in full domain (e.g. example.com or example.com/help) or path (e.g. /support) to use custom address. See Apache or Nginx for further instructions'
+      help:    'The default URL for your knowledge base is e.g. example.com or example.com/help. To serve it from a custom URL instead, enter the destination below (e.g., "/support", "example.com", or "example.com/support"). Then, follow the directions under "Web Server Configuration" to complete the process.'
       screen:
       screen:
         admin_custom_address:
         admin_custom_address:
           shown: true
           shown: true

+ 1 - 1
app/assets/javascripts/app/views/generic/error/placeholder.jst.eco

@@ -2,6 +2,6 @@
   <%- @icon %>
   <%- @icon %>
   <h2><% if @status isnt undefined: %><%- @T('Status Code') %>: <%= @status %>. <% end %><%- @T(@detail) %></h2>
   <h2><% if @status isnt undefined: %><%- @T('Status Code') %>: <%= @status %>. <% end %><%- @T(@detail) %></h2>
   <% if @action: %>
   <% if @action: %>
-  <div class="btn btn--action js-action"><%= @T(@action) %></div>
+  <div class="btn btn--action js-action"><%- @T(@action) %></div>
   <% end %>
   <% end %>
 </div>
 </div>

+ 1 - 1
app/assets/javascripts/app/views/generic/icon_picker.jst.eco

@@ -6,7 +6,7 @@
   <%- @Icon('arrow-down', 'dropdown-arrow') %>
   <%- @Icon('arrow-down', 'dropdown-arrow') %>
 </div>
 </div>
 <div class="dropdown-menu dropdown-menu-left js-dropdown">
 <div class="dropdown-menu dropdown-menu-left js-dropdown">
-  <input type="search" class="dropdown-filter js-filter-icons" placeholder="<%= @T('Filter icons') %>">
+  <input type="search" class="dropdown-filter js-filter-icons" placeholder="<%- @T('Search...') %>">
   <ul class="js-iconGrid dropdown-grid" role="menu"></ul>
   <ul class="js-iconGrid dropdown-grid" role="menu"></ul>
   <div class="dropdown-filter-placeholder">
   <div class="dropdown-filter-placeholder">
     <span class="js-noMatch">¯\_(ツ)_/¯</span>
     <span class="js-noMatch">¯\_(ツ)_/¯</span>

+ 1 - 1
app/assets/javascripts/app/views/generic/multi_locales.jst.eco

@@ -2,7 +2,7 @@
   <thead>
   <thead>
     <tr>
     <tr>
       <th width="85%"><%- @T('Language') %>
       <th width="85%"><%- @T('Language') %>
-      <th width="5%"><%- @T('Primary') %>
+      <th width="5%"><%- @T('Default') %>
       <th width="10%"><%- @T('Delete') %>
       <th width="10%"><%- @T('Delete') %>
   </thead>
   </thead>
   <tbody>
   <tbody>

Некоторые файлы не были показаны из-за большого количества измененных файлов