Localize dashboard text

diff --git a/js/Common.js b/js/Common.js
index 403cef2e21e54457ca3fdd08c2c2dd2aab81fa0e..5a78933218b98c7ac1787c114d499f83dbde660d 100644 (file)
--- a/js/Common.js
+++ b/js/Common.js
@@ -432,7 +432,7 @@ CRM.validate = CRM.validate || {
       $el.parent().find('.ui-dialog-titlebar-close').attr('title', ts('Close'));
       // Add resize button
       if ($el.parent().hasClass('crm-container') && $el.dialog('option', 'resizable')) {
-        $el.parent().find('.ui-dialog-titlebar').append($('<button class="crm-dialog-titlebar-resize ui-dialog-titlebar-close" title="'+ts('Resize')+'" style="right:2em;"/>').button({icons: {primary: 'ui-icon-newwin'}, text: false}));
+        $el.parent().find('.ui-dialog-titlebar').append($('<button class="crm-dialog-titlebar-resize ui-dialog-titlebar-close" title="'+ts('Toggle fullscreen')+'" style="right:2em;"/>').button({icons: {primary: 'ui-icon-newwin'}, text: false}));
         $('.crm-dialog-titlebar-resize', $el.parent()).click(function(e) {
           if ($el.data('origSize')) {
             $el.dialog('option', $el.data('origSize'));

diff --git a/js/jquery/jquery.dashboard.js b/js/jquery/jquery.dashboard.js
index d4d396dea834c82b07e4e1cc055b890cdd479cb5..c56cbcec0c0182ed401f1270f884ed6e4a14bec9 100644 (file)
--- a/js/jquery/jquery.dashboard.js
+++ b/js/jquery/jquery.dashboard.js
@@ -452,19 +452,19 @@
       // Default controls.  External script can add more with widget.addControls()
       widget.controls = {
         settings: {
-          description: 'Configure this dashlet',
+          description: ts('Configure this dashlet'),
           callback: widget.toggleSettings
         },
         minimize: {
-          description: 'Collapse or expand this dashlet',
+          description: ts('Collapse or expand'),
           callback: widget.toggleMinimize
         },
         fullscreen: {
-          description: 'View this dashlet in full screen mode',
+          description: ts('View fullscreen'),
           callback: widget.enterFullscreen
         },
         close: {
-          description: 'Remove this dashlet from your dashboard',
+          description: ts('Remove from dashboard'),
           callback: widget.remove
         }
       };
@@ -600,9 +600,9 @@
   // Public static properties of dashboard.  Default settings.
   $.fn.dashboard.defaults = {
     columns: 2,
-    emptyPlaceholderInner: 'There are no dashlets in this column of your dashboard.',
-    fullscreenHeaderInner: 'Back to dashboard mode',
-    throbberMarkup: '<div class="crm-loading-element">Loading...</div>',
+    emptyPlaceholderInner: ts('There are no dashlets in this column of your dashboard.'),
+    fullscreenHeaderInner: ts('Back to dashboard mode'),
+    throbberMarkup: '<div class="crm-loading-element">' + ts('Loading') + '...</div>',
     animationSpeed: 200,
     callbacks: {},
     widgetCallbacks: {}