Fix for PLT-2218 & PLT-2222

- Also includes missing loc strings for frontend es.json
- Sort web [locale].json by id

api/post.go

@@ -604,12 +604,12 @@ func sendNotifications(c *Context, post *model.Post, team *model.Team, channel *
 			year := fmt.Sprintf("%d", tm.Year())
 			zone, _ := tm.Zone()
 
-			subjectPage := NewServerTemplatePage("post_subject", c.Locale)
+			subjectPage := NewServerTemplatePage("post_subject", profileMap[id].Locale)
 			subjectPage.Props["Subject"] = userLocale("api.templates.post_subject",
 				map[string]interface{}{"SubjectText": subjectText, "TeamDisplayName": team.DisplayName,
 					"Month": month[:3], "Day": day, "Year": year})
 
-			bodyPage := NewServerTemplatePage("post_body", c.Locale)
+			bodyPage := NewServerTemplatePage("post_body", profileMap[id].Locale)
 			bodyPage.Props["SiteURL"] = c.GetSiteURL()
 			bodyPage.Props["PostMessage"] = model.ClearMentionTags(post.Message)
 			bodyPage.Props["TeamLink"] = teamURL + "/channels/" + channel.Name

web/react/components/admin_console/license_settings.jsx

@@ -120,8 +120,7 @@ class LicenseSettings extends React.Component {
                         expires: Utils.displayDate(parseInt(global.window.mm_license.ExpiresAt, 10)),
                         ldap: global.window.mm_license.LDAP
                     }}
-                    defaultMessage='<div><p>This compiled release of Mattermost platform is provided under a <a href="http://mattermost.com" target="_blank">commercial license</a>
+                    defaultMessage='<div><p>This compiled release of Mattermost platform is provided under a <a href="http://mattermost.com" target="_blank">commercial license</a> from Mattermost, Inc. based on your subscription level and is subject to the <a href="{terms}" target="_blank">Terms of Service.</a></p>
-                    from Mattermost, Inc. based on your subscription level and is subject to the <a href="{terms}" target="_blank">Terms of Service.</a></p>
                     <p>Your subscription details are as follows:</p>
                     Name: {name}<br />
                     Company or organization name: {company}<br/>
@@ -152,9 +151,7 @@ class LicenseSettings extends React.Component {
                     <p className='help-text'>
                         <FormattedHTMLMessage
                             id='admin.licence.keyMigration'
-                            defaultMessage='If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start,
+                            defaultMessage='If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start, <a href="http://mattermost.com" target="_blank">disable all Enterprise Edition features on this server</a>. This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.'
-                            <a href="http://mattermost.com" target="_blank">disable all Enterprise Edition features on this server</a>.
-                            This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.'
                         />
                     </p>
                 </div>

web/static/i18n/en.json

@@ -277,8 +277,8 @@
   "admin.service.attemptTitle": "Maximum Login Attempts:",
   "admin.service.cmdsDesc": "When true, user created slash commands will be allowed.",
   "admin.service.cmdsTitle": "Enable Slash Commands: ",
-  "admin.service.corsEx": "http://example.com https://example.com",
   "admin.service.corsDescription": "Enable HTTP Cross origin request from specific domains (separate by a spacebar). Use \"*\" if you want to allow CORS from any domain or leave it blank to disable it.",
+  "admin.service.corsEx": "http://example.com https://example.com",
   "admin.service.corsTitle": "Allow Cross-origin Requests from:",
   "admin.service.developerDesc": "(Developer Option) When true, extra information around errors will be displayed in the UI.",
   "admin.service.developerTitle": "Enable Developer Mode: ",

web/static/i18n/es.json

@@ -277,8 +277,8 @@
   "admin.service.attemptTitle": "Máximo de intentos de conexión:",
   "admin.service.cmdsDesc": "Cuando es verdadero, se permite la creación de comandos de barra por usuarios.",
   "admin.service.cmdsTitle": "Habilitar Comandos de Barra: ",
-  "admin.service.corsEx": "http://ejemplo.com https://ejemplo.com",
   "admin.service.corsDescription": "Habilita las solicitudes HTTP de origen cruzado para dominios en específico (separados por un espacio). Utiliza \"*\" si quieres habilitar CORS desde cualquier dominio o deja el campo en blanco para deshabilitarlo.",
+  "admin.service.corsEx": "http://ejemplo.com https://ejemplo.com",
   "admin.service.corsTitle": "Permitir Solicitudes de Origen Cruzado desde:",
   "admin.service.developerDesc": "(Opción de Desarrollador) Cuando está asignado en verdadero, información extra sobre errores se muestra en el UI.",
   "admin.service.developerTitle": "Habilitar modo de Desarrollador: ",
@@ -702,6 +702,7 @@
   "get_link.copy": "Copiar Enlace",
   "get_post_link_modal.help": "En enlace de abajo permite a los usuarios autorizados a ver tu mensaje.",
   "get_post_link_modal.title": "Copiar enlace Permanente",
+  "get_team_invite_link_modal.help": "Envía el siguiente enlace a tus compañeros para que se registren a este equipo. El enlace de invitación al equipo puede ser compartido con multiples compañeros y el mismo no cambiará a menos que sea regenerado en la Configuración del Equipo por un Administrador del Equipo.",
   "get_team_invite_link_modal.helpDisabled": "La creación de usuario ha sido deshabilitada para tu equipo. Por favor solicita más detalles a tu administrador de equipo.",
   "get_team_invite_link_modal.title": "Enlace de Invitación al Equipo",
   "intro_messages.DM": "Este es el inicio de tu historial de mensajes directos con {teammate}.<br />Los mensajes directos y archivos que se comparten aquí no son mostrados a personas fuera de esta área.",
@@ -982,18 +983,18 @@
   "team_import_tab.summary": "Ver Resumen",
   "team_member_modal.close": "Cerrar",
   "team_member_modal.members": "{team} Miembros",
-  "team_members_modal.confirmDemoteDescription": "Si te degradas a ti mismo de la función de Administrador de Sistema y no hay otro usuario con privilegios de Administrador de Sistema, tendrás que volver a asignar un Administrador del Sistema accediendo al servidor de Mattermost a través de un terminal y ejecutar el siguiente comando.",
+  "team_members_dropdown.confirmDemoteDescription": "Si te degradas a ti mismo de la función de Administrador de Sistema y no hay otro usuario con privilegios de Administrador de Sistema, tendrás que volver a asignar un Administrador del Sistema accediendo al servidor de Mattermost a través de un terminal y ejecutar el siguiente comando.",
-  "team_members_modal.confirmDemoteRoleTitle": "Confirmar el decenso del rol de Administrador de Sistema",
+  "team_members_dropdown.confirmDemoteRoleTitle": "Confirmar el decenso del rol de Administrador de Sistema",
-  "team_members_modal.confirmDemotion": "Confirmar decenso",
+  "team_members_dropdown.confirmDemotion": "Confirmar decenso",
-  "team_members_modal.confirmDemotionCmd": "platform -assign_role -team_name=\"tuequipo\" -email=\"nombre@tuempresa.com\" -role=\"system_admin\"",
+  "team_members_dropdown.confirmDemotionCmd": "platform -assign_role -team_name=\"tuequipo\" -email=\"nombre@tuempresa.com\" -role=\"system_admin\"",
-  "team_members_modal.inactive": "Inactivo",
+  "team_members_dropdown.inactive": "Inactivo",
-  "team_members_modal.makeActive": "Activar",
+  "team_members_dropdown.makeActive": "Activar",
-  "team_members_modal.makeAdmin": "Convertir a Admin de Equipo",
+  "team_members_dropdown.makeAdmin": "Hacer Admin de Equipo",
-  "team_members_modal.makeInactive": "Desactivar",
+  "team_members_dropdown.makeInactive": "Inactivar",
-  "team_members_modal.makeMember": "Convertir en Miembro",
+  "team_members_dropdown.makeMember": "Hacer Miembro",
-  "team_members_modal.member": "Miembro",
+  "team_members_dropdown.member": "Miembro",
-  "team_members_modal.systemAdmin": "Administrador de Sistema",
+  "team_members_dropdown.systemAdmin": "Admin del Sistema",
-  "team_members_modal.teamAdmin": "Admin de Equipo",
+  "team_members_dropdown.teamAdmin": "Admin del Equipo",
   "team_settings_modal.exportTab": "Exportar",
   "team_settings_modal.generalTab": "General",
   "team_settings_modal.importTab": "Importar",

web/static/i18n/pt.json

@@ -21,33 +21,6 @@
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "App Nativo Android",
   "activity_log_modal.iphoneNativeApp": "App Nativo para iPhone",
-  "analytics.chart.loading": "Carregando...",
-  "analytics.chart.meaningful": "Não há dados suficientes para uma representação significativa.",
-  "analytics.system.activeUsers": "Usuários Ativos Com Posts",
-  "analytics.system.channelTypes": "Tipos de Canal",
-  "analytics.system.postTypes": "Posts, Arquivos e Hashtags",
-  "analytics.system.privateGroups": "Grupos Privados",
-  "analytics.system.publicChannels": "Canais Públicos",
-  "analytics.system.textPosts": "Post com Texto somente",
-  "analytics.system.title": "Estatísticas do Sistema",
-  "analytics.system.totalFilePosts": "Posts com Arquivos",
-  "analytics.system.totalHashtagPosts": "Posts com Hashtags",
-  "analytics.system.totalIncomingWebhooks": "Webhooks Entrada",
-  "analytics.system.totalOutgoingWebhooks": "Webhooks Saída",
-  "analytics.system.totalCommands": "Total de Comandos",
-  "analytics.system.totalSessions": "Total de Sessões",
-  "analytics.system.totalPosts": "Total Posts",
-  "analytics.system.totalUsers": "Total de Usuários",
-  "analytics.system.totalTeams": "Total de Equipes",
-  "analytics.system.totalChannels": "Total de Canais",
-  "analytics.team.activeUsers": "Usuários Ativos Com Posts",
-  "analytics.team.recentActive": "Usuários Ativos Recentes",
-  "analytics.team.newlyCreated": "Novos Usuários Criados",
-  "analytics.team.privateGroups": "Grupos Privados",
-  "analytics.team.publicChannels": "Canais Públicos",
-  "analytics.team.title": "Estatísticas de Equipe para {team}",
-  "analytics.team.totalPosts": "Total Posts",
-  "analytics.team.totalUsers": "Total de Usuários",
   "admin.audits.reload": "Recarregar",
   "admin.audits.title": "Atividade de Usuário",
   "admin.email.allowEmailSignInDescription": "Quando verdadeiro, Mattermost permite aos usuários fazer login usando o e-mail e senha.",
@@ -451,6 +424,33 @@
   "admin.user_item.resetPwd": "Resetar Senha",
   "admin.user_item.sysAdmin": "Admin do Sistema",
   "admin.user_item.teamAdmin": "Admin Equipe",
+  "analytics.chart.loading": "Carregando...",
+  "analytics.chart.meaningful": "Não há dados suficientes para uma representação significativa.",
+  "analytics.system.activeUsers": "Usuários Ativos Com Posts",
+  "analytics.system.channelTypes": "Tipos de Canal",
+  "analytics.system.postTypes": "Posts, Arquivos e Hashtags",
+  "analytics.system.privateGroups": "Grupos Privados",
+  "analytics.system.publicChannels": "Canais Públicos",
+  "analytics.system.textPosts": "Post com Texto somente",
+  "analytics.system.title": "Estatísticas do Sistema",
+  "analytics.system.totalChannels": "Total de Canais",
+  "analytics.system.totalCommands": "Total de Comandos",
+  "analytics.system.totalFilePosts": "Posts com Arquivos",
+  "analytics.system.totalHashtagPosts": "Posts com Hashtags",
+  "analytics.system.totalIncomingWebhooks": "Webhooks Entrada",
+  "analytics.system.totalOutgoingWebhooks": "Webhooks Saída",
+  "analytics.system.totalPosts": "Total Posts",
+  "analytics.system.totalSessions": "Total de Sessões",
+  "analytics.system.totalTeams": "Total de Equipes",
+  "analytics.system.totalUsers": "Total de Usuários",
+  "analytics.team.activeUsers": "Usuários Ativos Com Posts",
+  "analytics.team.newlyCreated": "Novos Usuários Criados",
+  "analytics.team.privateGroups": "Grupos Privados",
+  "analytics.team.publicChannels": "Canais Públicos",
+  "analytics.team.recentActive": "Usuários Ativos Recentes",
+  "analytics.team.title": "Estatísticas de Equipe para {team}",
+  "analytics.team.totalPosts": "Total Posts",
+  "analytics.team.totalUsers": "Total de Usuários",
   "audit_table.accountActive": "Conta inativada",
   "audit_table.accountInactive": "Conta inativada",
   "audit_table.action": "Ação",
@@ -547,15 +547,15 @@
   "channel_invite.add": " Adicionar",
   "channel_invite.addNewMembers": "Adicionar Novo Membro para ",
   "channel_invite.close": "Fechar",
+  "channel_loader.connection_error": "Parece existir um problema com a sua conexão de internet.",
   "channel_loader.posted": "Postado",
   "channel_loader.socketError": "Por favor verifique sua conexão, Mattermost está inalcançável. Se este problema persistir, peça ao administrador para verificar a porta WebSocket.",
   "channel_loader.someone": "Alguém",
   "channel_loader.something": " fez algo novo",
+  "channel_loader.unknown_error": "Recebido um código de status inesperado do servidor.",
   "channel_loader.uploadedFile": " enviado um arquivo",
   "channel_loader.uploadedImage": " enviado uma imagem",
   "channel_loader.wrote": " escreveu: ",
-  "channel_loader.connection_error": "Parece existir um problema com a sua conexão de internet.",
-  "channel_loader.unknown_error": "Recebido um código de status inesperado do servidor.",
   "channel_members_modal.addNew": " Adicionar Novos Membros",
   "channel_members_modal.close": "Fechar",
   "channel_members_modal.removeMember": "Remover Membro",