Differentiate settings links

The "settings" links in the Getting Started section (or, if #399 were to happen, "more" menu) and compose sections are now different; the "compose" link is "Edit profile," while the one in the Getting Started section is now "Preferences."

All languages have been updated to accommodate this, based on the existing usages of these phrases in language files in the Rails part of the app!

addresses part of #384
rebase/4.0.0rc2
Jessica Stokes 2017-01-04 19:47:02 -08:00
parent 9bb1b97d2a
commit 7ac55d2674
No known key found for this signature in database
GPG Key ID: E3DE5BE038F70FE9
9 changed files with 17 additions and 10 deletions

View File

@ -21,7 +21,7 @@ const NavigationBar = React.createClass({
<div style={{ flex: '1 1 auto', marginLeft: '8px', color: '#9baec8' }}> <div style={{ flex: '1 1 auto', marginLeft: '8px', color: '#9baec8' }}>
<strong style={{ fontWeight: '500', display: 'block', color: '#fff' }}>{this.props.account.get('acct')}</strong> <strong style={{ fontWeight: '500', display: 'block', color: '#fff' }}>{this.props.account.get('acct')}</strong>
<a href='/settings/profile' style={{ color: 'inherit', textDecoration: 'none' }}><FormattedMessage id='navigation_bar.settings' defaultMessage='Settings' /></a> · <Link to='/timelines/public' style={{ color: 'inherit', textDecoration: 'none' }}><FormattedMessage id='navigation_bar.public_timeline' defaultMessage='Public timeline' /></Link> · <a href='/auth/sign_out' data-method='delete' style={{ color: 'inherit', textDecoration: 'none' }}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a> <a href='/settings/profile' style={{ color: 'inherit', textDecoration: 'none' }}><FormattedMessage id='navigation_bar.edit_profile' defaultMessage='Edit profile' /></a> · <a href='/auth/sign_out' data-method='delete' style={{ color: 'inherit', textDecoration: 'none' }}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a>
</div> </div>
</div> </div>
); );

View File

@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
const messages = defineMessages({ const messages = defineMessages({
heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' }, heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Public timeline' }, public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Public timeline' },
settings: { id: 'navigation_bar.settings', defaultMessage: 'Settings' }, preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' } follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }
}); });
@ -39,7 +39,7 @@ const GettingStarted = ({ intl, me }) => {
<div style={{ position: 'relative' }}> <div style={{ position: 'relative' }}>
<div style={hamburgerStyle}><i className='fa fa-bars' /></div> <div style={hamburgerStyle}><i className='fa fa-bars' /></div>
<ColumnLink icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' /> <ColumnLink icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />
<ColumnLink icon='cog' text={intl.formatMessage(messages.settings)} href='/settings/profile' /> <ColumnLink icon='cog' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />
{followRequests} {followRequests}
</div> </div>

View File

@ -36,7 +36,8 @@ const en = {
"compose_form.publish": "Veröffentlichen", "compose_form.publish": "Veröffentlichen",
"compose_form.sensitive": "Medien als sensitiv markieren", "compose_form.sensitive": "Medien als sensitiv markieren",
"compose_form.unlisted": "Öffentlich nicht auflisten", "compose_form.unlisted": "Öffentlich nicht auflisten",
"navigation_bar.settings": "Einstellungen", "navigation_bar.edit_profile": "Profil bearbeiten",
"navigation_bar.preferences": "Einstellungen",
"navigation_bar.public_timeline": "Öffentlich", "navigation_bar.public_timeline": "Öffentlich",
"navigation_bar.logout": "Abmelden", "navigation_bar.logout": "Abmelden",
"reply_indicator.cancel": "Abbrechen", "reply_indicator.cancel": "Abbrechen",

View File

@ -40,7 +40,8 @@ const en = {
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.sensitive": "Mark media as sensitive", "compose_form.sensitive": "Mark media as sensitive",
"compose_form.private": "Mark as private", "compose_form.private": "Mark as private",
"navigation_bar.settings": "Settings", "navigation_bar.edit_profile": "Edit profile",
"navigation_bar.preferences": "Preferences",
"navigation_bar.public_timeline": "Public timeline", "navigation_bar.public_timeline": "Public timeline",
"navigation_bar.logout": "Logout", "navigation_bar.logout": "Logout",
"reply_indicator.cancel": "Cancel", "reply_indicator.cancel": "Cancel",

View File

@ -37,7 +37,8 @@ const es = {
"compose_form.publish": "Publicar", "compose_form.publish": "Publicar",
"compose_form.sensitive": "Marcar el contenido como sensible", "compose_form.sensitive": "Marcar el contenido como sensible",
"compose_form.unlisted": "Privado", "compose_form.unlisted": "Privado",
"navigation_bar.settings": "Ajustes", "navigation_bar.edit_profile": "Editar perfil",
"navigation_bar.preferences": "Preferencias",
"navigation_bar.public_timeline": "Público", "navigation_bar.public_timeline": "Público",
"navigation_bar.logout": "Cerrar sesión", "navigation_bar.logout": "Cerrar sesión",
"reply_indicator.cancel": "Cancelar", "reply_indicator.cancel": "Cancelar",

View File

@ -38,7 +38,8 @@ const fr = {
"compose_form.publish": "Pouet", "compose_form.publish": "Pouet",
"compose_form.sensitive": "Marquer le contenu comme délicat", "compose_form.sensitive": "Marquer le contenu comme délicat",
"compose_form.unlisted": "Ne pas apparaître dans le fil public", "compose_form.unlisted": "Ne pas apparaître dans le fil public",
"navigation_bar.settings": "Paramètres", "navigation_bar.edit_profile": "Modifier le profil",
"navigation_bar.preferences": "Préférences",
"navigation_bar.public_timeline": "Public", "navigation_bar.public_timeline": "Public",
"navigation_bar.logout": "Déconnexion", "navigation_bar.logout": "Déconnexion",
"reply_indicator.cancel": "Annuler", "reply_indicator.cancel": "Annuler",

View File

@ -38,7 +38,8 @@ const hu = {
"compose_form.publish": "Tülk!", "compose_form.publish": "Tülk!",
"compose_form.sensitive": "Tartalom érzékenynek jelölése", "compose_form.sensitive": "Tartalom érzékenynek jelölése",
"compose_form.unlisted": "Listázatlan mód", "compose_form.unlisted": "Listázatlan mód",
"navigation_bar.settings": "Beállítások", "navigation_bar.edit_profile": "Profil szerkesztése",
"navigation_bar.preferences": "Beállítások",
"navigation_bar.public_timeline": "Nyilvános időfolyam", "navigation_bar.public_timeline": "Nyilvános időfolyam",
"navigation_bar.logout": "Kijelentkezés", "navigation_bar.logout": "Kijelentkezés",
"reply_indicator.cancel": "Mégsem", "reply_indicator.cancel": "Mégsem",

View File

@ -36,7 +36,8 @@ const pt = {
"compose_form.publish": "Publicar", "compose_form.publish": "Publicar",
"compose_form.sensitive": "Marcar conteúdo como sensível", "compose_form.sensitive": "Marcar conteúdo como sensível",
"compose_form.unlisted": "Modo não-listado", "compose_form.unlisted": "Modo não-listado",
"navigation_bar.settings": "Configurações", "navigation_bar.edit_profile": "Editar perfil",
"navigation_bar.preferences": "Preferências",
"navigation_bar.public_timeline": "Timeline Pública", "navigation_bar.public_timeline": "Timeline Pública",
"navigation_bar.logout": "Logout", "navigation_bar.logout": "Logout",
"reply_indicator.cancel": "Cancelar", "reply_indicator.cancel": "Cancelar",

View File

@ -38,7 +38,8 @@ const uk = {
"compose_form.publish": "Дмухнути", "compose_form.publish": "Дмухнути",
"compose_form.sensitive": "Непристойний зміст", "compose_form.sensitive": "Непристойний зміст",
"compose_form.unlisted": "Таємний режим", "compose_form.unlisted": "Таємний режим",
"navigation_bar.settings": "Налаштування", "navigation_bar.edit_profile": "Редагувати профіль",
"navigation_bar.preferences": "Налаштування",
"navigation_bar.public_timeline": "Публічна стіна", "navigation_bar.public_timeline": "Публічна стіна",
"navigation_bar.logout": "Вийти", "navigation_bar.logout": "Вийти",
"reply_indicator.cancel": "Відмінити", "reply_indicator.cancel": "Відмінити",