more work for #1368

public/language/en_GB/notifications.json

@@ -7,5 +7,7 @@
 	"outgoing_link": "Outgoing Link",
 	"outgoing_link_message": "You are now leaving",
 	"continue_to": "Continue to",
-	"return_to": "Return to "
+	"return_to": "Return to ",
+	"new_notification": "New Notification",
+	"you_have_unread_notifications": "You have unread notifications."
 }

public/language/en_GB/topic.json

@@ -57,6 +57,14 @@
 	"thread_tools.restore": "Restore Topic",
 	"thread_tools.restore_confirm": "Are you sure you want to restore this thread?",
 
+	"topic_lock_success": "Topic has been successfully locked.",
+	"topic_unlock_success": "Topic has been successfully unlocked.",
+
+	"topic_pin_success": "Topic has been successfully pinned.",
+	"topic_unpin_success": "Topic has been successfully unpinned.",
+
+	"topic_move_success": "This topic has been successfully moved to %1",
+
 	"post_delete_confirm": "Are you sure you want to delete this post?",
 	"post_restore_confirm": "Are you sure you want to restore this post?",
 	"post_delete_error": "Could not delete this post!",
@@ -74,6 +82,7 @@
 	"loading_more_posts": "Loading More Posts",
 	"move_topic": "Move Topic",
 	"move_post": "Move Post",
+	"post_moved": "Post moved!",
 	"fork_topic": "Fork Topic",
 	"topic_will_be_moved_to": "This topic will be moved to the category",
 	"fork_topic_instruction": "Click the posts you want to fork",

public/src/forum/topic.js

@@ -414,13 +414,7 @@ define(['forum/pagination', 'forum/topic/threadTools', 'forum/topic/postTools',
 			$('.topic-main-buttons .post_reply').attr('disabled', locked).html(locked ? 'Locked <i class="fa fa-lock"></i>' : 'Reply');
 
 			if (alert) {
-				app.alert({
-					'alert_id': 'thread_lock',
-					type: 'success',
-					title: 'Thread ' + (locked ? 'Locked' : 'Unlocked'),
-					message: 'Thread has been successfully ' + (locked ? 'locked' : 'unlocked'),
-					timeout: 5000
-				});
+				app.alertSuccess(locked ? '[[topic:topic_lock_success]]' : '[[topic:topic_unlock_success]]');
 			}
 
 			thread_state.locked = locked ? '1' : '0';
@@ -450,13 +444,7 @@ define(['forum/pagination', 'forum/topic/threadTools', 'forum/topic/postTools',
 				$('.pin_thread').html(translated);
 
 				if (alert) {
-					app.alert({
-						'alert_id': 'thread_pin',
-						type: 'success',
-						title: 'Thread ' + (pinned ? 'Pinned' : 'Unpinned'),
-						message: 'Thread has been successfully ' + (pinned ? 'pinned' : 'unpinned'),
-						timeout: 5000
-					});
+					app.alertSuccess(pinned ? '[[topic:topic_pin_success]]' : '[[topic:topic_unpin_success]]');
 				}
 				thread_state.pinned = pinned ? '1' : '0';
 			});

public/src/forum/topic/move.js

@@ -71,10 +71,10 @@ define(function() {
 			}, function(err) {
 				modal.modal('hide');
 				if(err) {
-					return app.alertError('This topic could not be moved to ' + targetCategoryLabel + '.<br />Please try again later');
+					return app.alertError(err.message);
 				}
 
-				app.alertSuccess('This topic has been successfully moved to ' + targetCategoryLabel);
+				app.alertSuccess('[[topic:topic_move_success, ' + targetCategoryLabel + ']]');
 			});
 		}
 

public/src/forum/topic/postTools.js

@@ -163,7 +163,7 @@ define(['composer', 'share'], function(composer, share) {
 						tid: tid
 					}, function(err) {
 						if(err) {
-							return translator.translate('[[topic:post_' + action + '_error]]', app.alertError);
+							app.alertError('[[topic:post_' + action + '_error]]');
 						}
 					});
 				}
@@ -218,7 +218,7 @@ define(['composer', 'share'], function(composer, share) {
 
 			$('#topicId').val('');
 
-			app.alertSuccess('Post moved!');
+			app.alertSuccess('[[topic:post_moved]]');
 		});
 	}
 
@@ -230,9 +230,8 @@ define(['composer', 'share'], function(composer, share) {
 						if(err) {
 							return app.alertError(err.message);
 						}
-						translator.translate('[[topic:flag_success]]', function(message) {
-							app.alertSuccess(message);
-						});
+
+						app.alertSuccess('[[topic:flag_success]]');
 					});
 				}
 			});

public/src/forum/unread.js

@@ -29,7 +29,7 @@ define(['forum/recent'], function(recent) {
 			}
 			socket.emit('topics.markTidsRead', tids, function(err) {
 				if(err) {
-					return app.alertError('There was an error marking topics read!');
+					return app.alertError(err.message);
 				}
 
 				doneRemovingTids(tids);
@@ -39,7 +39,7 @@ define(['forum/recent'], function(recent) {
 		$('#markAllRead').on('click', function() {
 			socket.emit('topics.markAllRead', function(err) {
 				if(err) {
-					return app.alertError('There was an error marking topics read!');
+					return app.alertError(err.message);
 				}
 
 				app.alertSuccess('[[unread:topics_marked_as_read.success]]');
@@ -68,7 +68,7 @@ define(['forum/recent'], function(recent) {
 
 			socket.emit('topics.markCategoryTopicsRead', cid, function(err) {
 				if(err) {
-					return app.alertError('There was an error marking topics read!');
+					return app.alertError(err.message);
 				}
 
 				doneRemovingTids(tids);

public/src/modules/notifications.js

@@ -95,8 +95,8 @@ define(['sounds'], function(sound) {
 
 			app.alert({
 				alert_id: 'new_notif',
-				title: 'New notification',
-				message: 'You have unread notifications.',
+				title: '[[notifications:new_notification]]',
+				message: '[[notifications:you_have_unread_notifications]]',
 				type: 'warning',
 				timeout: 2000
 			});