From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 18 May 2021 14:55:46 +0000 (-0400)
Subject: SearchKit - Standardize labels with Title Case and no colon
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ccaaa6785b9e29a460203417651c2a3afa646778;p=civicrm-core.git

SearchKit - Standardize labels with Title Case and no colon

The trailing colon is a pain for translators.
---

diff --git a/ext/search_kit/ang/crmSearchAdmin/compose/pager.html b/ext/search_kit/ang/crmSearchAdmin/compose/pager.html
index 0932e7b4d0..954911b1aa 100644
--- a/ext/search_kit/ang/crmSearchAdmin/compose/pager.html
+++ b/ext/search_kit/ang/crmSearchAdmin/compose/pager.html
@@ -28,7 +28,7 @@
   </div>
   <div class="form-inline text-right">
     <label for="crm-search-results-page-size" >
-      {{:: ts('Page size:') }}
+      {{:: ts('Page Size') }}
     </label>
     <input class="form-control" id="crm-search-results-page-size" type="number" ng-model="$ctrl.limit" min="10" step="10" ng-change="onChangeLimit()">
   </div>
diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html
index 045284a5e6..ac8dc8a689 100644
--- a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html
+++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html
@@ -17,7 +17,7 @@
         <input id="crm-saved-search-label" class="form-control" ng-model="$ctrl.savedSearch.label" type="text" required placeholder="{{ ts('Untitled Search') }}" />
       </div>
       <div class="crm-flex-4 form-inline">
-        <label for="crm-search-main-entity">{{:: ts('Search for:') }}</label>
+        <label for="crm-search-main-entity">{{:: ts('Search for') }}</label>
         <input id="crm-search-main-entity" class="form-control huge" ng-model="$ctrl.savedSearch.api_entity" crm-ui-select="::{allowClear: false, data: entities}" ng-disabled="$ctrl.savedSearch.id" />
         <div class="btn-group btn-group-md pull-right">
           <button type="button" class="btn" ng-class="{'btn-primary': status === 'unsaved', 'btn-warning': status === 'saving', 'btn-success': status === 'saved'}" ng-disabled="status !== 'unsaved'" ng-click="$ctrl.save()">
diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.html
index 52bb428b6d..41c63274b9 100644
--- a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.html
+++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.html
@@ -1,6 +1,6 @@
 <fieldset>
   <div class="form-inline">
-    <label for="crm-search-admin-display-label">{{:: ts('Name:') }} <span class="crm-marker">*</span></label>
-    <input id="crm-search-admin-display-label" type="text" class="form-control" ng-model="$ctrl.display.label" required placeholder="{{ ts('Untitled') }}"/>
+    <label for="crm-search-admin-display-label">{{:: ts('Name') }} <span class="crm-marker">*</span></label>
+    <input id="crm-search-admin-display-label" type="text" class="form-control" ng-model="$ctrl.display.label" required placeholder="{{:: ts('Untitled') }}"/>
   </div>
 </fieldset>
diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html
index d37ae8b8c3..18d9decbf3 100644
--- a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html
+++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html
@@ -1,5 +1,5 @@
 <div class="form-inline" ng-repeat="sort in $ctrl.display.settings.sort">
-  <label for="crm-search-display-sort-{{$index}}">{{ $index ? ts('Also by:') : ts('Sort by:') }}</label>
+  <label for="crm-search-display-sort-{{$index}}">{{ $index ? ts('Also by') : ts('Sort by') }}</label>
   <input id="crm-search-display-sort-{{$index}}" class="form-control huge" ng-model="sort[0]" crm-ui-select="{data: $ctrl.parent.fieldsForSort}" />
   <select class="form-control" ng-model="sort[1]">
     <option value="ASC">{{ ts('Ascending') }}</option>
@@ -8,6 +8,6 @@
   <a href class="crm-hover-button" title="{{:: ts('Clear') }}" ng-click="$ctrl.display.settings.sort.splice($index, 1)"><i class="crm-i fa-times" aria-hidden="true"></i></a>
 </div>
 <div class="form-inline">
-  <label for="crm-search-display-add-sort">{{ $ctrl.display.settings.sort.length ? ts('Also by:') : ts('Sort by:') }}</label>
+  <label for="crm-search-display-add-sort">{{ $ctrl.display.settings.sort.length ? ts('Also by') : ts('Sort by') }}</label>
   <input id="crm-search-display-add-sort" class="form-control crm-action-menu fa-plus huge" ng-model="controls.sort" crm-ui-select="{placeholder: ts('Select field'), data: $ctrl.parent.fieldsForSort}" ng-change="$ctrl.parent.pushSetting('sort', [controls.sort, 'ASC']); controls.sort = '';"/>
 </div>
diff --git a/ext/search_kit/ang/crmSearchAdmin/displays/colType/buttons.html b/ext/search_kit/ang/crmSearchAdmin/displays/colType/buttons.html
index 58a972e1e9..6b2829dcd7 100644
--- a/ext/search_kit/ang/crmSearchAdmin/displays/colType/buttons.html
+++ b/ext/search_kit/ang/crmSearchAdmin/displays/colType/buttons.html
@@ -1,6 +1,6 @@
 <div class="form-inline">
   <label for="crm-search-admin-col-size-{{$index}}">
-    {{:: ts('Button Size:') }}
+    {{:: ts('Button Size') }}
   </label>
   <select id="crm-search-admin-col-size-{{$index}}" class="form-control" ng-model="col.size">
     <option value="btn-lg">{{:: ts('Large') }}</option>
diff --git a/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html b/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html
index 21737f80ea..4ce65de917 100644
--- a/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html
+++ b/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html
@@ -1,7 +1,7 @@
 <div class="form-inline crm-search-admin-flex-row">
   <label title="{{ ts('Display as clickable link') }}" >
     <input type="checkbox" ng-checked="col.link" ng-click="$ctrl.parent.toggleLink(col)" >
-    {{ col.link ? ts('Link:') : ts('Link') }}
+    {{:: ts('Link') }}
   </label>
   <select class="form-control" ng-model="$ctrl.link.target" ng-if="col.link">
     <option value>{{:: ts('Open normally') }}</option>
@@ -14,7 +14,7 @@
 <div class="form-inline crm-search-admin-flex-row">
   <label>
     <input type="checkbox" ng-checked="col.title" ng-click="col.title = col.title ? null : $ctrl.parent.getFieldLabel(col.key)" >
-    {{ col.title ? ts('Tooltip:') : ts('Tooltip') }}
+    {{:: ts('Tooltip') }}
   </label>
   <input class="form-control crm-flex-1" type="text" ng-model="col.title" ng-if="col.title" ng-model-options="{updateOn: 'blur'}" />
   <crm-search-admin-token-select ng-if="col.title" api-entity="$ctrl.apiEntity" api-params="$ctrl.apiParams" model="col" field="title"></crm-search-admin-token-select>
@@ -22,7 +22,7 @@
 <div class="form-inline crm-search-admin-flex-row">
   <label title="{{ ts('Change the contents of this field, or combine multiple field values.') }}">
     <input type="checkbox" ng-checked="col.rewrite" ng-click="$ctrl.parent.toggleRewrite(col)" >
-    {{ col.rewrite ? ts('Rewrite:') : ts('Rewrite') }}
+    {{:: ts('Rewrite') }}
   </label>
   <input type="text" class="form-control crm-flex-1" ng-if="col.rewrite" ng-model="col.rewrite" ng-model-options="{updateOn: 'blur'}">
   <crm-search-admin-token-select ng-if="col.rewrite" api-entity="$ctrl.apiEntity" api-params="$ctrl.apiParams" model="col" field="rewrite"></crm-search-admin-token-select>
@@ -30,10 +30,10 @@
 <div class="form-inline">
   <label ng-if="$ctrl.parent.isEditable(col)" title="{{:: ts('Users will be able to click to edit this field.') }}">
     <input type="checkbox" ng-checked="col.editable" ng-click="$ctrl.parent.toggleEditable(col)">
-    {{:: ts('In-place edit') }}
+    {{:: ts('In-Place Edit') }}
   </label>
   <label ng-if="!$ctrl.parent.isEditable(col)" class="disabled" title="{{:: ts('Read-only or rewritten fields cannot be editable.') }}">
     <input type="checkbox" disabled>
-    {{:: ts('In-place edit') }}
+    {{:: ts('In-Place Edit') }}
   </label>
 </div>
diff --git a/ext/search_kit/ang/crmSearchAdmin/displays/colType/menu.html b/ext/search_kit/ang/crmSearchAdmin/displays/colType/menu.html
index 1758e2f63f..f9ea37ce1a 100644
--- a/ext/search_kit/ang/crmSearchAdmin/displays/colType/menu.html
+++ b/ext/search_kit/ang/crmSearchAdmin/displays/colType/menu.html
@@ -1,6 +1,6 @@
 <div class="form-inline">
   <label for="crm-search-admin-col-size-{{$index}}">
-    {{:: ts('Menu Button Size:') }}
+    {{:: ts('Menu Button Size') }}
   </label>
   <select id="crm-search-admin-col-size-{{$index}}" class="form-control" ng-model="col.size">
     <option value="btn-lg">{{:: ts('Large') }}</option>
@@ -9,7 +9,7 @@
     <option value="btn-xs">{{:: ts('Tiny') }}</option>
   </select>
   <label for="crm-search-admin-col-style-{{$index}}">
-    {{:: ts('Style:') }}
+    {{:: ts('Style') }}
   </label>
   <select id="crm-search-admin-col-style-{{$index}}" class="form-control" ng-model="col.style">
     <option ng-repeat="opt in $ctrl.parent.styles" value="{{ opt.key }}">{{ opt.value }}</option>
@@ -17,7 +17,7 @@
 </div>
 <div class="form-inline">
   <label>
-    {{:: ts('Menu Text/Icon:') }}
+    {{:: ts('Menu Text/Icon') }}
   </label>
   <div class="btn-group">
     <button type="button" class="btn btn-{{ col.style + ' ' + col.size }}">
diff --git a/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
index 3c778cfdb0..6334927aa3 100644
--- a/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
+++ b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html
@@ -1,12 +1,12 @@
 <fieldset ng-include="'~/crmSearchAdmin/crmSearchAdminDisplaySort.html'"></fieldset>
 <fieldset>
   <div class="form-inline">
-    <label for="crm-search-admin-display-style">{{:: ts('Style:') }}</label>
+    <label for="crm-search-admin-display-style">{{:: ts('Style') }}</label>
     <select id="crm-search-admin-display-style" class="form-control" ng-model="$ctrl.display.settings.style" ng-change="$ctrl.display.settings.symbol = ''">
       <option value="ul">{{:: ts('Bullets') }}</option>
       <option value="ol">{{:: ts('Numbers') }}</option>
     </select>
-    <label for="crm-search-admin-display-symbol">{{:: ts('Symbol:') }}</label>
+    <label for="crm-search-admin-display-symbol">{{:: ts('Symbol') }}</label>
     <select id="crm-search-admin-display-symbol" class="form-control" ng-model="$ctrl.display.settings.symbol">
       <option ng-repeat="symbol in $ctrl.symbols[$ctrl.display.settings.style]" value="{{ symbol.char }}">
         {{ symbol.label }}
@@ -38,7 +38,7 @@
     <fieldset ng-repeat="col in $ctrl.display.settings.columns" class="crm-draggable">
       <legend><i class="crm-i fa-arrows crm-search-move-icon"></i> {{ $ctrl.parent.getColLabel(col) }}</legend>
       <div class="form-inline" title="{{ ts('Should this item display on its own line or inline with other items?') }}">
-        <label><input type="checkbox" ng-model="col.break"> {{:: ts('Display on new line') }}</label>
+        <label><input type="checkbox" ng-model="col.break"> {{:: ts('New Line') }}</label>
         <button type="button" class="btn-xs pull-right" ng-click="$ctrl.parent.removeCol($index)" title="{{:: ts('Remove') }}">
           <i class="crm-i fa-ban"></i>
         </button>
@@ -46,7 +46,7 @@
       <div class="form-inline crm-search-admin-flex-row">
         <label>
           <input type="checkbox" ng-checked="col.label" ng-click="col.label = col.label ? null : $ctrl.parent.getColLabel(col)" >
-          {{ col.label ? ts('Label:') : ts('Label') }}
+          {{:: ts('Label') }}
         </label>
         <input ng-if="col.label" class="form-control crm-flex-1" type="text" ng-model="col.label" ng-model-options="{updateOn: 'blur'}">
         <crm-search-admin-token-select ng-if="col.label" api-entity="$ctrl.apiEntity" api-params="$ctrl.apiParams" model="col" field="label"></crm-search-admin-token-select>
diff --git a/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html
index c1c03ab816..f068b4bcda 100644
--- a/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html
+++ b/ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html
@@ -31,14 +31,14 @@
     <fieldset ng-repeat="col in $ctrl.display.settings.columns" class="crm-draggable">
       <legend><i class="crm-i fa-arrows crm-search-move-icon"></i> {{ $ctrl.parent.getColLabel(col) }}</legend>
       <div class="form-inline crm-search-admin-flex-row">
-        <label for="crm-search-admin-edit-col-{{ $index }}">{{:: ts('Header:') }}</label>
+        <label for="crm-search-admin-edit-col-{{ $index }}">{{:: ts('Header') }}</label>
         <input id="crm-search-admin-edit-col-{{ $index }}" class="form-control crm-flex-1" type="text" ng-model="col.label" >
         <button type="button" class="btn-xs" ng-click="$ctrl.parent.removeCol($index)" title="{{:: ts('Remove') }}">
           <i class="crm-i fa-ban"></i>
         </button>
       </div>
       <div class="form-inline">
-        <label>{{:: ts('Alignment:') }}</label>
+        <label>{{:: ts('Alignment') }}</label>
         <select ng-model="col.alignment" class="form-control">
           <option value="">{{:: ts('Left') }}</option>
           <option value="text-center">{{:: ts('Center') }}</option>
diff --git a/ext/search_kit/ang/crmSearchAdmin/group.html b/ext/search_kit/ang/crmSearchAdmin/group.html
index dabb22b1d4..db196e3930 100644
--- a/ext/search_kit/ang/crmSearchAdmin/group.html
+++ b/ext/search_kit/ang/crmSearchAdmin/group.html
@@ -3,9 +3,9 @@
 </div>
 
 <div class="form-inline">
-  <label for="crm-search-admin-group-title">{{ ts('Group Title:') }} <span class="crm-marker">*</span></label>
+  <label for="crm-search-admin-group-title">{{ ts('Group Title') }} <span class="crm-marker">*</span></label>
   <input id="crm-search-admin-group-title" class="form-control" placeholder="{{:: ts('Untitled') }}" ng-model="$ctrl.savedSearch.groups[0].title" ng-disabled="!smartGroupColumns.length" ng-required="smartGroupColumns.length">
-  <label for="api-save-search-select-column">{{:: ts('Contact Column:') }}</label>
+  <label for="api-save-search-select-column">{{:: ts('Contact Column') }}</label>
   <input id="api-save-search-select-column" ng-model="$ctrl.savedSearch.api_params.select[0]" class="form-control huge" crm-ui-select="{data: smartGroupColumns}"/>
 </div>
 <fieldset ng-show="smartGroupColumns.length">
diff --git a/ext/search_kit/ang/crmSearchAdmin/searchList.html b/ext/search_kit/ang/crmSearchAdmin/searchList.html
index 856f4e89a8..8eef0258c5 100644
--- a/ext/search_kit/ang/crmSearchAdmin/searchList.html
+++ b/ext/search_kit/ang/crmSearchAdmin/searchList.html
@@ -1,7 +1,7 @@
 <div id="bootstrap-theme" class="crm-search">
   <h1 crm-page-title>{{:: ts('Saved Searches') }}</h1>
   <div class="form-inline">
-    <label for="search-list-filter">{{:: ts('Filter:') }}</label>
+    <label for="search-list-filter">{{:: ts('Filter') }}</label>
     <input class="form-control" type="search" id="search-list-filter" ng-model="$ctrl.searchFilter" placeholder="&#xf002">
     <a class="btn btn-primary pull-right" href="#/create/Contact/">
       <i class="crm-i fa-plus"></i>
diff --git a/ext/search_kit/ang/crmSearchAdmin/tabs.html b/ext/search_kit/ang/crmSearchAdmin/tabs.html
index 800139aea7..c5cf94aeb0 100644
--- a/ext/search_kit/ang/crmSearchAdmin/tabs.html
+++ b/ext/search_kit/ang/crmSearchAdmin/tabs.html
@@ -7,7 +7,7 @@
 <li role="presentation" ng-class="{active: controls.tab === 'group'}" ng-if="$ctrl.savedSearch.groups.length" title="{{ !$ctrl.groupExists ? ts('Group will be deleted.') : '' }}">
   <a href ng-click="selectTab('group')" ng-disabled="!$ctrl.groupExists">
     <i class="crm-i fa-users"></i>
-    {{:: ts('Smart Group:') }} {{ $ctrl.savedSearch.groups[0].title }}
+    {{:: ts('Smart Group') }} {{ $ctrl.savedSearch.groups[0].title }}
   </a>
   <button type="button" class="btn-xs btn-danger-outline crm-search-delete-display" ng-click="$ctrl.removeGroup()" title="{{ $ctrl.groupExists ? ts('Delete') : ts('Undelete') }}">
     <i class="crm-i fa-{{ $ctrl.groupExists ? 'trash' : 'undo' }}"></i>
@@ -33,7 +33,7 @@
         {{:: ts('Smart Group') }}
       </a>
     </li>
-    <li class="dropdown-header">{{ ts('Display:') }}</li>
+    <li class="dropdown-header">{{ ts('Display') }}</li>
     <li ng-repeat="type in ::$ctrl.displayTypes">
       <a href ng-click="$ctrl.addDisplay(type.id)">
         <i class="crm-i {{:: type.icon }}"></i>