Refactoring api to use translations (chunk 2)

- Add spanish translations
- Does not include tests
- Add func to get the translations for a user locale

1 files changed, 21 insertions, 20 deletions

diff --git a/api/slackimport.go b/api/slackimport.go
index e0a0ff036..6497ac261 100644
--- a/api/slackimport.go
+++ b/api/slackimport.go
@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/model"
+	"github.com/mattermost/platform/utils"
 	"io"
 	"mime/multipart"
 	"strconv"
@@ -44,7 +45,7 @@ func SlackConvertTimeStamp(ts string) int64 {
 
 	timeStamp, err := strconv.ParseInt(timeString, 10, 64)
 	if err != nil {
-		l4g.Warn("Bad timestamp detected")
+		l4g.Warn(utils.T("api.slackimport.slack_convert_timestamp.bad.warn"))
 		return 1
 	}
 	return timeStamp * 1000 // Convert to milliseconds
@@ -91,7 +92,7 @@ func SlackParsePosts(data io.Reader) []SlackPost {
 
 func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map[string]*model.User {
 	// Log header
-	log.WriteString("\r\n Users Created\r\n")
+	log.WriteString(utils.T("api.slackimport.slack_add_users.created"))
 	log.WriteString("===============\r\n\r\n")
 
 	addedUsers := make(map[string]*model.User)
@@ -118,9 +119,9 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map
 
 		if mUser := ImportUser(&newUser); mUser != nil {
 			addedUsers[sUser.Id] = mUser
-			log.WriteString("Email, Password: " + newUser.Email + ", " + password + "\r\n")
+			log.WriteString(utils.T("api.slackimport.slack_add_users.email_pwd", map[string]interface{}{"Email": newUser.Email, "Password": password}))
 		} else {
-			log.WriteString("Unable to import user: " + sUser.Username + "\r\n")
+			log.WriteString(utils.T("api.slackimport.slack_add_users.unable_import", map[string]interface{}{"Username": sUser.Username}))
 		}
 	}
 
@@ -132,10 +133,10 @@ func SlackAddPosts(channel *model.Channel, posts []SlackPost, users map[string]*
 		switch {
 		case sPost.Type == "message" && (sPost.SubType == "" || sPost.SubType == "file_share"):
 			if sPost.User == "" {
-				l4g.Debug("Message without user")
+				l4g.Debug(utils.T("api.slackimport.slack_add_posts.without_user.debug"))
 				continue
 			} else if users[sPost.User] == nil {
-				l4g.Debug("User: " + sPost.User + " does not exist!")
+				l4g.Debug(utils.T("api.slackimport.slack_add_posts.user_no_exists.debug"), sPost.User)
 				continue
 			}
 			newPost := model.Post{
@@ -147,10 +148,10 @@ func SlackAddPosts(channel *model.Channel, posts []SlackPost, users map[string]*
 			ImportPost(&newPost)
 		case sPost.Type == "message" && sPost.SubType == "file_comment":
 			if sPost.Comment["user"] == "" {
-				l4g.Debug("Message without user")
+				l4g.Debug(utils.T("api.slackimport.slack_add_posts.msg_no_usr.debug"))
 				continue
 			} else if users[sPost.Comment["user"]] == nil {
-				l4g.Debug("User: " + sPost.User + " does not exist!")
+				l4g.Debug(utils.T("api.slackimport.slack_add_posts.user_no_exists.debug"), sPost.User)
 				continue
 			}
 			newPost := model.Post{
@@ -163,16 +164,16 @@ func SlackAddPosts(channel *model.Channel, posts []SlackPost, users map[string]*
 		case sPost.Type == "message" && sPost.SubType == "bot_message":
 			// In the future this will use the "Action Post" spec to post
 			// a message without using a username. For now we just warn that we don't handle this case
-			l4g.Warn("Slack bot posts are not imported yet")
+			l4g.Warn(utils.T("api.slackimport.slack_add_posts.bot.warn"))
 		default:
-			l4g.Warn("Unsupported post type: " + sPost.Type + ", " + sPost.SubType)
+			l4g.Warn(utils.T("api.slackimport.slack_add_posts.unsupported.warn"), sPost.Type, sPost.SubType)
 		}
 	}
 }
 
 func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[string][]SlackPost, users map[string]*model.User, log *bytes.Buffer) map[string]*model.Channel {
 	// Write Header
-	log.WriteString("\r\n Channels Added \r\n")
+	log.WriteString(utils.T("api.slackimport.slack_add_channels.added"))
 	log.WriteString("=================\r\n\r\n")
 
 	addedChannels := make(map[string]*model.Channel)
@@ -188,12 +189,12 @@ func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[str
 		if mChannel == nil {
 			// Maybe it already exists?
 			if result := <-Srv.Store.Channel().GetByName(teamId, sChannel.Name); result.Err != nil {
-				l4g.Debug("Failed to import: %s", newChannel.DisplayName)
-				log.WriteString("Failed to import: " + newChannel.DisplayName + "\r\n")
+				l4g.Debug(utils.T("api.slackimport.slack_add_channels.import_failed.debug"), newChannel.DisplayName)
+				log.WriteString(utils.T("api.slackimport.slack_add_channels.import_failed", map[string]interface{}{"DisplayName": newChannel.DisplayName}))
 				continue
 			} else {
 				mChannel = result.Data.(*model.Channel)
-				log.WriteString("Merged with existing channel: " + newChannel.DisplayName + "\r\n")
+				log.WriteString(utils.T("api.slackimport.slack_add_channels.merge", map[string]interface{}{"DisplayName": newChannel.DisplayName}))
 			}
 		}
 		log.WriteString(newChannel.DisplayName + "\r\n")
@@ -207,11 +208,11 @@ func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[str
 func SlackImport(fileData multipart.File, fileSize int64, teamID string) (*model.AppError, *bytes.Buffer) {
 	zipreader, err := zip.NewReader(fileData, fileSize)
 	if err != nil || zipreader.File == nil {
-		return model.NewAppError("SlackImport", "Unable to open zip file", err.Error()), nil
+		return model.NewLocAppError("SlackImport", "api.slackimport.slack_import.zip.app_error", nil, err.Error()), nil
 	}
 
 	// Create log file
-	log := bytes.NewBufferString("Mattermost Slack Import Log\r\n")
+	log := bytes.NewBufferString(utils.T("api.slackimport.slack_import.log"))
 
 	var channels []SlackChannel
 	var users []SlackUser
@@ -219,7 +220,7 @@ func SlackImport(fileData multipart.File, fileSize int64, teamID string) (*model
 	for _, file := range zipreader.File {
 		reader, err := file.Open()
 		if err != nil {
-			return model.NewAppError("SlackImport", "Unable to open: "+file.Name, err.Error()), log
+			return model.NewLocAppError("SlackImport", "api.slackimport.slack_import.open.app_error", map[string]interface{}{"Filename": file.Name}, err.Error()), log
 		}
 		if file.Name == "channels.json" {
 			channels = SlackParseChannels(reader)
@@ -243,11 +244,11 @@ func SlackImport(fileData multipart.File, fileSize int64, teamID string) (*model
 	addedUsers := SlackAddUsers(teamID, users, log)
 	SlackAddChannels(teamID, channels, posts, addedUsers, log)
 
-	log.WriteString("\r\n Notes \r\n")
+	log.WriteString(utils.T("api.slackimport.slack_import.notes"))
 	log.WriteString("=======\r\n\r\n")
 
-	log.WriteString("- Some posts may not have been imported because they where not supported by this importer.\r\n")
-	log.WriteString("- Slack bot posts are currently not supported.\r\n")
+	log.WriteString(utils.T("api.slackimport.slack_import.note1"))
+	log.WriteString(utils.T("api.slackimport.slack_import.note2"))
 
 	return nil, log
 }