diff --git a/packages/telescope-comments/lib/helpers.js b/packages/telescope-comments/lib/helpers.js index a60a90485..e77218da4 100644 --- a/packages/telescope-comments/lib/helpers.js +++ b/packages/telescope-comments/lib/helpers.js @@ -24,9 +24,9 @@ Comments.helpers({getPageUrl: function () {return Comments.getPageUrl(this);}}); Comments.getAuthorName = function (comment) { var user = Meteor.users.findOne(comment.userId); if (user) { - return user.getUserName(); + return user.getDisplayName(); } else { return comment.author; } }; -Comments.helpers({getAuthorName: function () {return Comments.getAuthorName(this);}}); \ No newline at end of file +Comments.helpers({getAuthorName: function () {return Comments.getAuthorName(this);}}); diff --git a/packages/telescope-core/lib/client/templates/common/layout.js b/packages/telescope-core/lib/client/templates/common/layout.js index 562f3b79f..45fb6dee2 100644 --- a/packages/telescope-core/lib/client/templates/common/layout.js +++ b/packages/telescope-core/lib/client/templates/common/layout.js @@ -22,7 +22,7 @@ Template.layout.onCreated(function (){ } } - + }); }); @@ -65,7 +65,8 @@ Template.layout.helpers({ navLayout: function () { return Settings.get('navLayout', 'top-nav'); }, - pageName : function(){ + pageName : function() { + FlowRouter.watchPathChange(); return FlowRouter.current().route.name; }, extraCode: function() { diff --git a/packages/telescope-lib/lib/client/template_replacement.js b/packages/telescope-lib/lib/client/template_replacement.js index 07599b358..fcbdc4be1 100644 --- a/packages/telescope-lib/lib/client/template_replacement.js +++ b/packages/telescope-lib/lib/client/template_replacement.js @@ -1,8 +1,5 @@ Meteor.startup(function () { - // "custom_" is always loaded last, so it takes priority over every other prefix - Telescope.config.addCustomPrefix("custom_"); - // loop over custom prefixes Telescope.config.customPrefixes.forEach(function (prefix) { @@ -20,4 +17,4 @@ Meteor.startup(function () { }); }); -}); \ No newline at end of file +}); diff --git a/packages/telescope-lib/lib/custom_template_prefix.js b/packages/telescope-lib/lib/custom_template_prefix.js new file mode 100644 index 000000000..4dc1924b3 --- /dev/null +++ b/packages/telescope-lib/lib/custom_template_prefix.js @@ -0,0 +1,7 @@ +Meteor.startup(function () { + + // "custom_" is always loaded last, so it takes priority over every other prefix + Telescope.config.addCustomPrefix("custom_"); + +}); + diff --git a/packages/telescope-lib/package.js b/packages/telescope-lib/package.js index c606c13a4..2127c1cef 100644 --- a/packages/telescope-lib/package.js +++ b/packages/telescope-lib/package.js @@ -97,6 +97,7 @@ Package.onUse(function (api) { 'lib/colors.js', 'lib/icons.js', 'lib/router.js', + 'lib/custom_template_prefix.js' ], ['client', 'server']); api.addFiles([ diff --git a/packages/telescope-search/i18n/bg.i18n.json b/packages/telescope-search/i18n/bg.i18n.json index 203f6946a..8fc1bd088 100644 --- a/packages/telescope-search/i18n/bg.i18n.json +++ b/packages/telescope-search/i18n/bg.i18n.json @@ -1,3 +1,6 @@ { - "load_more" : "Зареди повече" + "load_more" : "Зареди още", + "search" : "Търси", + "search_logs" : "История на търсенето", + "see_what_people_are_searching_for" : "Виж какво търсят потребителите" } \ No newline at end of file diff --git a/packages/telescope-tags/i18n/bg.i18n.json b/packages/telescope-tags/i18n/bg.i18n.json index 422971720..f5870ad05 100644 --- a/packages/telescope-tags/i18n/bg.i18n.json +++ b/packages/telescope-tags/i18n/bg.i18n.json @@ -1,4 +1,10 @@ { "categories" : "Категории", - "add_and_remove_categories" : "Добавяне и изтриване на категории." + "add_and_remove_categories" : "Добавяне и премахване на категории.", + "all_categories" : "Всички", + "invalid_category" : "Невалидна категория", + "categoriesBehavior": "Позволи на потребителя да филтрира по:", + "categories_behavior_one_at_a_time": "само една категория наведнъж", + "categories_behavior_multiple": "няколко категории наведнъж", + "hideEmptyCategories": "Скривай празните категории" } \ No newline at end of file diff --git a/packages/telescope-users/i18n/bg.i18n.json b/packages/telescope-users/i18n/bg.i18n.json index 802fb8687..2697749ca 100644 --- a/packages/telescope-users/i18n/bg.i18n.json +++ b/packages/telescope-users/i18n/bg.i18n.json @@ -1,19 +1,32 @@ { + "please_fill_in_missing_information_to_finish_signing_up" : "Моля въведете липсващата информация за да завършите регистрацията си.", "bio" : "Биография", + "displayName" : "Име", "email" : "Емайл", + "twitterUsername" : "Twitter Username", + "website" : "Website", + "htmlBio" : "Биография", + "user_profile_saved" : "Данните Ви са запазени.", + "this_email_is_already_taken" : "Този email е вече зает.", + "all_fields_are_required" : "Всички полета са задължителни", "please_complete_your_profile_below_before_continuing" : "Моля попълнете вашия профил по-долу, преди да продължите.", "account" : "Акаунт", "username" : "Потребителско име", "display_name" : "Прякор", + "city" : "Град", + "twitter_username" : "Twitter Username", + "github_username" : "GitHub Username", + "site_url" : "Уебсайт URL", "password" : "Парола", "change_password" : "Променете парола?", "old_password" : "Стара парола", "new_password" : "Нова парола", "email_notifications" : "Емайл известия", + "new_users" : "Нови Потребители", "new_posts" : "Нови Публикации", "comments_on_my_posts" : "Коментари на мои публикации", "replies_to_my_comments" : "Отговори на мои коментари", - "comments" : "коментари", + "comments" : "Коментари", "forgot_password" : "Забравена Парола?", "profile_updated" : "Профила е обновен", "please_fill_in_your_email_below_to_finish_signing_up" : "Моля попълнете емайл адреса си за да завършите регистрацията.", @@ -34,19 +47,25 @@ "delete" : "Изтриване", "member_since" : "Потребител от", "edit_profile" : "Промяна на профила", - "sign_in" : "Влезте", - "sign_in_" : "Влезте!", + "sign_in" : "Влез", + "sign_in_" : "Влез!", "sign_up_" : "Регистрирайте се!", "dont_have_an_account" : "Нямате Акаунт?", "already_have_an_account" : "Вече имате акаунт?", "sign_up" : "Регистрирай се", "please_fill_in_all_fields" : "Моля попълнете всички полета", "invite_" : "Покани ", - "left" : " остава", - "invite_none_left" : "Покана (none left)", + "left" : " остават", + "invite_none_left" : "Покана (0 оставащи)", "all" : "Всичко", "invited" : "Поканен", "uninvited" : "Поканата е отхвърлена", "filter_by" : "Филтрирай по ", - "sort_by" : "Сортирай по " + "sort_by" : "Сортирай по ", + "you_have_been_logged_out": "Бяхте отписан от системата.", + "delete_users_posts_comments_as_well": "Да се изтрият ли също публикациите и коментарите на потребителя?", + "commentedAt": "Коментирано на", + "downvotedAt": "Не харесано на", + "postedAt": "Публикувано на", + "upvotedAt": "Харесано на" } \ No newline at end of file diff --git a/packages/telescope-users/i18n/en.i18n.json b/packages/telescope-users/i18n/en.i18n.json index bab5b1151..09e40bf61 100644 --- a/packages/telescope-users/i18n/en.i18n.json +++ b/packages/telescope-users/i18n/en.i18n.json @@ -63,5 +63,9 @@ "filter_by" : "Filter by", "sort_by" : "Sort by", "you_have_been_logged_out": "You have been logged out", - "delete_users_posts_comments_as_well": "Delete user's posts and comments as well?" + "delete_users_posts_comments_as_well": "Delete user's posts and comments as well?", + "commentedAt": "Commented at", + "downvotedAt": "Downvoted at", + "postedAt": "Posted at", + "upvotedAt": "Upvoted at" } \ No newline at end of file