mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Merge pull request #2106 from mattermost/PLT-1900

Просмотр исходного кода 
PLT-1900 removing lang from preview and making spanish beta
Этот коммит содержится в:
Joram Wilander
2016-02-08 14:58:11 -05:00
родитель 3ca75906e0 d0ad249bc2
Коммит 137920b479
7 изменённых файлов: 43 добавлений и 56 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
api/channel.go
Просмотреть файл

@@ -301,11 +301,11 @@ func PostUpdateChannelHeaderMessageAndForget(c *Context, channelId string, oldCh
var message string
if oldChannelHeader == "" {
message = fmt.Sprintf(c.T("api.channel.post_update_channel_header_message_and_forget.updated_to"), user.Username, newChannelHeader)
message = fmt.Sprintf(utils.T("api.channel.post_update_channel_header_message_and_forget.updated_to"), user.Username, newChannelHeader)
} else if newChannelHeader == "" {
message = fmt.Sprintf(c.T("api.channel.post_update_channel_header_message_and_forget.removed"), user.Username, oldChannelHeader)
message = fmt.Sprintf(utils.T("api.channel.post_update_channel_header_message_and_forget.removed"), user.Username, oldChannelHeader)
} else {
message = fmt.Sprintf(c.T("api.channel.post_update_channel_header_message_and_forget.updated_from"), user.Username, oldChannelHeader, newChannelHeader)
message = fmt.Sprintf(utils.T("api.channel.post_update_channel_header_message_and_forget.updated_from"), user.Username, oldChannelHeader, newChannelHeader)
}
post := &model.Post{
@@ -460,7 +460,7 @@ func JoinChannel(c *Context, channelId string, role string) {
c.Err = err
return
}
PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(c.T("api.channel.join_channel.post_and_forget"), user.Username))
PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(utils.T("api.channel.join_channel.post_and_forget"), user.Username))
} else {
c.Err = model.NewLocAppError("join", "api.channel.join_channel.permissions.app_error", nil, "")
c.Err.StatusCode = http.StatusForbidden
@@ -578,7 +578,7 @@ func leave(c *Context, w http.ResponseWriter, r *http.Request) {
RemoveUserFromChannel(c.Session.UserId, c.Session.UserId, channel)
PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(c.T("api.channel.leave.left"), user.Username))
PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(utils.T("api.channel.leave.left"), user.Username))
result := make(map[string]string)
result["id"] = channel.Id
@@ -849,7 +849,7 @@ func addMember(c *Context, w http.ResponseWriter, r *http.Request) {
c.LogAudit("name=" + channel.Name + " user_id=" + userId)
PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(c.T("api.channel.add_member.added"), nUser.Username, oUser.Username))
PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(utils.T("api.channel.add_member.added"), nUser.Username, oUser.Username))
<-Srv.Store.Channel().UpdateLastViewedAt(id, oUser.Id)
w.Write([]byte(cm.ToJson()))

4
web/react/components/user_settings/user_settings_advanced.jsx
Просмотреть файл

@@ -47,10 +47,6 @@ const holders = defineMessages({
EMBED_PREVIEW: {
id: 'user.settings.advance.embed_preview',
defaultMessage: 'Show preview snippet of links below message'
},
LOC_PREVIEW: {
id: 'user.settings.advance.loc_preview',
defaultMessage: 'Show user language in display settings'
}
});

75
web/react/components/user_settings/user_settings_display.jsx
Просмотреть файл

@@ -10,7 +10,6 @@ import PreferenceStore from '../../stores/preference_store.jsx';
import * as Utils from '../../utils/utils.jsx';
import Constants from '../../utils/constants.jsx';
const PreReleaseFeatures = Constants.PRE_RELEASE_FEATURES;
import {savePreferences} from '../../utils/client.jsx';
import {intlShape, injectIntl, defineMessages, FormattedMessage} from 'mm-intl';
@@ -379,46 +378,44 @@ class UserSettingsDisplay extends React.Component {
);
}
if (Utils.isFeatureEnabled(PreReleaseFeatures.LOC_PREVIEW)) {
if (this.props.activeSection === 'languages') {
var inputs = [];
inputs.push(
<ManageLanguages
user={this.props.user}
key='languages-ui'
/>
);
if (this.props.activeSection === 'languages') {
var inputs = [];
inputs.push(
<ManageLanguages
user={this.props.user}
key='languages-ui'
/>
);
languagesSection = (
<SettingItemMax
title={formatMessage(holders.language)}
width='medium'
inputs={inputs}
updateSection={(e) => {
this.updateSection('');
e.preventDefault();
}}
/>
);
} else {
var locale = 'English';
Utils.languages().forEach((l) => {
if (l.value === this.props.user.locale) {
locale = l.name;
}
});
languagesSection = (
<SettingItemMax
title={formatMessage(holders.language)}
width='medium'
inputs={inputs}
updateSection={(e) => {
this.updateSection('');
e.preventDefault();
}}
/>
);
} else {
var locale = 'English';
Utils.languages().forEach((l) => {
if (l.value === this.props.user.locale) {
locale = l.name;
}
});
languagesSection = (
<SettingItemMin
title={formatMessage(holders.language)}
width='medium'
describe={locale}
updateSection={() => {
this.updateSection('languages');
}}
/>
);
}
languagesSection = (
<SettingItemMin
title={formatMessage(holders.language)}
width='medium'
describe={locale}
updateSection={() => {
this.updateSection('languages');
}}
/>
);
}
return (

4
web/react/utils/constants.jsx
Просмотреть файл

@@ -456,10 +456,6 @@ export default {
EMBED_PREVIEW: {
label: 'embed_preview',
description: 'Show preview snippet of links below message'
},
LOC_PREVIEW: {
label: 'loc_preview',
description: 'Show user language in display settings'
}
},
OVERLAY_TIME_DELAY: 400,

2
web/react/utils/utils.jsx
Просмотреть файл

@@ -1373,7 +1373,7 @@ export function languages() {
},
{
value: 'es',
name: 'Español'
name: 'Español (Beta)'
}
]
);

1
web/static/i18n/en.json
Просмотреть файл

@@ -1126,7 +1126,6 @@
"user.settings.advance.enabled": "enabled",
"user.settings.advance.markdown_preview": "Show markdown preview option in message input box",
"user.settings.advance.embed_preview": "Show preview snippet of links below message",
"user.settings.advance.loc_preview": "Show user language in display settings",
"user.settings.advance.sendDesc": "If enabled 'Enter' inserts a new line and 'Ctrl + Enter' submits the message.",
"user.settings.advance.preReleaseDesc": "Check any pre-released features you'd like to preview. You may also need to refresh the page before the setting will take effect.",
"user.settings.advance.title": "Advanced Settings",

1
web/static/i18n/es.json
Просмотреть файл

@@ -1050,7 +1050,6 @@
"user.settings.advance.enabled": "habilitada(s)",
"user.settings.advance.feature": " Característica ",
"user.settings.advance.features": " Características ",
"user.settings.advance.loc_preview": "Mostrar el idioma del usuario en la configuración de visualización",
"user.settings.advance.markdown_preview": "Mostrar la previsualización de mensajes escritos con markdown",
"user.settings.advance.off": "Encendido",
"user.settings.advance.on": "Apagado",