Skip to content

Commit a6772e1

Browse files
authored
Merge pull request #704 from can-keklik/SERVER-1069
SERVER-1069
2 parents aa7f574 + de0a58e commit a6772e1

File tree

3 files changed

+9
-16
lines changed

3 files changed

+9
-16
lines changed

frontend/express/public/localization/dashboard/dashboard.properties

+6-6
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ taskmanager.yes-delete-report = Yes, delete report
156156
taskmanager.rerunning = Re-Running
157157
taskmanager.select-origin = Select origin
158158
taskmanager.origin = Origin
159-
taskmanager.auto = Auto refresh
159+
taskmanager.auto = Auto refresh
160160
taskmanager.manual = One time
161161
taskmanager.edit = Edit
162162
taskmanager.last-today = Today
@@ -310,7 +310,7 @@ events.general.event = Event
310310
events.general.event-description = Event description
311311
events.general.action.perform-action = Perform action
312312
events.general.action.delete = Delete
313-
events.general.action.show = Show
313+
events.general.action.show = Show
314314
events.general.action.hide = Hide
315315
events.general.none-chosen = Select at least one event
316316
events.general.update-not-successful = Updating events failed.
@@ -386,7 +386,7 @@ events.overview.empty-text-admin = Configure events overview to visualise your m
386386
events.overview.empty-text-user = Request an admin of this application to configure events overview to visualise most important custom events at a glance.
387387
events.overview.save-changes = Save changes
388388
events.overview.unknown = NA
389-
events.all.empty-title = This applications doesn't have any custom events
389+
events.all.empty-title = This application doesn't have any custom events
390390
events.all.empty-text = Log some custom events inside your application's code using the SDKs and visit this section later
391391

392392
#export
@@ -527,7 +527,7 @@ user-settings.force-password-reset = It is time to change your password.
527527
user-settings.please-correct-input = Please fix errors before submitting the form
528528
user-settings.api-key-length = API key should be exactly 32 characters long
529529
user-settings.regenerate-api-key = Regenerate API key
530-
530+
531531
#report manager
532532
report-manager.name = Name
533533
report-manager.desc = Description
@@ -545,7 +545,7 @@ app-users.download-export = Download user's exported data
545545
app-users.delete-export = Purge user's exported data
546546
app-users.delete-userdata = Purge user's data completely
547547
app-users.delete-userdata-confirm = Do you really want to purge all data associated with this user?
548-
app-users.export-started = Exporting has started sucessfully.
548+
app-users.export-started = Exporting has started sucessfully.
549549
app-users.export-finished = User data is exported. You can download it now.
550550
app-users.export-finished-click = Click here to download.
551551
app-users.export-failed = There was error during export process. There might be more information in logs.
@@ -572,7 +572,7 @@ token_manager.table.app = App
572572
token_manager.table.status = Status
573573
token_manager.table.endpoint = Endpoint
574574
token_manager.table.purpose = Description
575-
token_manager.table.purpose-desc = Some information to help user identify created token.
575+
token_manager.table.purpose-desc = Some information to help user identify created token.
576576
token_manager.table.endpoint-desc = You can limit token to a single or multiple endpoints. Given endpoints are interpreted as regular expressions.
577577
token_manager.table.multi-desc = Token can be used multiple times
578578
token_manager.table.apps-title = Token usage

plugins/crashes/frontend/public/javascripts/countly.views.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1780,7 +1780,7 @@ app.addPageScript("/drill#", function() {
17801780
var drillClone;
17811781
var self = app.drillView;
17821782
if (countlyGlobal.record_crashes) {
1783-
$("#drill-types").append('<div id="drill-type-crashes" class="item">' + jQuery.i18n.map["crashes.title"] + '</div>');
1783+
$("#drill-types").append('<div id="drill-type-crashes" class="item"><div class="inner"><span class="icon crashes"><i class="material-icons">warning</i></span><span class="text">' + jQuery.i18n.map["crashes.title"] + '</span></div></div>');
17841784
$("#drill-type-crashes").on("click", function() {
17851785
if ($(this).hasClass("active")) {
17861786
return true;
@@ -1792,10 +1792,6 @@ app.addPageScript("/drill#", function() {
17921792

17931793
$("#drill-no-event").fadeOut();
17941794
$("#segmentation-start").fadeOut().remove();
1795-
$(this).parents(".cly-select").removeClass("dark");
1796-
1797-
$(".event-select.cly-select").find(".text").text(jQuery.i18n.map["drill.select-event"]);
1798-
$(".event-select.cly-select").find(".text").data("value", "");
17991795

18001796
var currEvent = "[CLY]_crash";
18011797

plugins/views/frontend/public/javascripts/countly.views.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,8 @@ app.addPageScript("/drill#", function() {
638638
var drillClone;
639639
var self = app.drillView;
640640
if (countlyGlobal.record_views) {
641-
$("#drill-types").append('<div id="drill-type-views" class="item">' + jQuery.i18n.map["views.title"] + '</div>');
641+
642+
$("#drill-types").append('<div id="drill-type-views" class="item"><div class="inner"><span class="icon views"></span><span class="text">' + jQuery.i18n.map["views.title"] + '</span></div></div>');
642643
$("#drill-type-views").on("click", function() {
643644
if ($(this).hasClass("active")) {
644645
return true;
@@ -650,10 +651,6 @@ app.addPageScript("/drill#", function() {
650651

651652
$("#drill-no-event").fadeOut();
652653
$("#segmentation-start").fadeOut().remove();
653-
$(this).parents(".cly-select").removeClass("dark");
654-
655-
$(".event-select.cly-select").find(".text").text(jQuery.i18n.map["drill.select-event"]);
656-
$(".event-select.cly-select").find(".text").data("value", "");
657654

658655
var currEvent = "[CLY]_view";
659656

0 commit comments

Comments
 (0)