diff --git a/src/assets/index.html b/src/assets/index.html index 360d471..ee13a6a 100644 --- a/src/assets/index.html +++ b/src/assets/index.html @@ -193,7 +193,7 @@
diff --git a/src/assets/javascripts/app.js b/src/assets/javascripts/app.js index e386ce5..61a9ffb 100644 --- a/src/assets/javascripts/app.js +++ b/src/assets/javascripts/app.js @@ -590,7 +590,7 @@ var vm = new Vue({ } }, deleteFolder: function(folder) { - if (confirm(this.$t('confirm_delete_folder', {name: folder.title}))) { + if (confirm(this.$t('confirm_delete', {name: folder.title}))) { api.folders.delete(folder.id).then(function() { vm.feedSelected = null vm.refreshStats() @@ -615,7 +615,7 @@ var vm = new Vue({ } }, deleteFeed: function(feed) { - if (confirm(this.$t('confirm_delete_feed', {name: feed.title}))) { + if (confirm(this.$t('confirm_delete', {name: feed.title}))) { api.feeds.delete(feed.id).then(function() { vm.feedSelected = null vm.refreshStats() diff --git a/src/assets/javascripts/i18n.js b/src/assets/javascripts/i18n.js index 50e729d..71358ec 100644 --- a/src/assets/javascripts/i18n.js +++ b/src/assets/javascripts/i18n.js @@ -95,15 +95,10 @@ "zh": "全部订阅", "ru": "Все ленты" }, - "refreshing": { - "en": "Refreshing", - "zh": "正在刷新", - "ru": "Обновление" - }, - "left": { - "en": "left", - "zh": "剩余", - "ru": "осталось" + "refreshing_progress": { + "en": "Refreshing ({ $count } left)", + "zh": "正在刷新(剩余{ $count })", + "ru": "Обновление: осталось { $count }" }, "show_feeds": { "en": "Show Feeds", @@ -320,12 +315,7 @@ "zh": "请输入订阅链接", "ru": "Введите ссылку на ленту" }, - "confirm_delete_folder": { - "en": "Are you sure you want to delete { $name }?", - "zh": "确定要删除{ $name }?", - "ru": "Вы уверены, что хотите удалить { $name }?" - }, - "confirm_delete_feed": { + "confirm_delete": { "en": "Are you sure you want to delete { $name }?", "zh": "确定要删除{ $name }?", "ru": "Вы уверены, что хотите удалить { $name }?"