Merge branch 'feature/i18n-for-user-timeline' into 'develop'

i18n for User Timeline

Closes #61

See merge request pleroma/pleroma-fe!212
This commit is contained in:
lambda 2018-03-12 09:31:34 +00:00
commit 90e3ab45d4
3 changed files with 8 additions and 2 deletions

View file

@ -6,7 +6,7 @@
# For Translators # For Translators
To translate Pleroma, add your language to i18n/messages.js. Pleroma will set your language by your browser locale, but you can temporarily force it in the code by changing the locale in main.js. To translate Pleroma, add your language to [src/i18n/messages.js](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/src/i18n/messages.js). Pleroma will set your language by your browser locale, but you can temporarily force it in the code by changing the locale in main.js.
# FOR ADMINS # FOR ADMINS

View file

@ -3,7 +3,7 @@
<div v-if="user" class="user-profile panel panel-default base00-background"> <div v-if="user" class="user-profile panel panel-default base00-background">
<user-card-content :user="user" :switcher="true"></user-card-content> <user-card-content :user="user" :switcher="true"></user-card-content>
</div> </div>
<Timeline :title="'User Timeline'" v-bind:timeline="timeline" v-bind:timeline-name="'user'" :user-id="userId"/> <Timeline :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/>
</div> </div>
</template> </template>

View file

@ -283,6 +283,9 @@ const en = {
general: { general: {
submit: 'Submit', submit: 'Submit',
apply: 'Apply' apply: 'Apply'
},
user_profile: {
timeline_title: 'User Timeline'
} }
} }
@ -1135,6 +1138,9 @@ const ru = {
general: { general: {
submit: 'Отправить', submit: 'Отправить',
apply: 'Применить' apply: 'Применить'
},
user_profile: {
timeline_title: 'Лента пользователя'
} }
} }