MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed remaining conflicts markers

This commit is contained in:
Eliot Berriot 2019-03-21 10:13:13 +01:00
parent 4310a7e372
commit 97ef15906d
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CONTRIBUTING.rst
View File

@ -353,11 +353,7 @@ Internationalization
-------------------- --------------------
We're using https://github.com/Polyconseil/vue-gettext to manage i18n in the project. We're using https://github.com/Polyconseil/vue-gettext to manage i18n in the project.
<<<<<<< HEAD
When working on the front-end, any end-user string should be translated
using either ``<translate>yourstring</translate>`` or ``$gettext('yourstring')``
function.
||||||| parent of 21fb39dd... Update docs/developers/index.rst, docs/developers/subsonic.rst files
When working on the front-end, any end-user string should be marked as a translatable string, When working on the front-end, any end-user string should be marked as a translatable string,
with the proper context, as described below. with the proper context, as described below.
@ -685,7 +681,6 @@ Collecting translatable strings
If you want to ensure your translatable strings are correctly marked for translation, If you want to ensure your translatable strings are correctly marked for translation,
you can try to extract them. you can try to extract them.
>>>>>>> 21fb39dd... Update docs/developers/index.rst, docs/developers/subsonic.rst files
Extraction is done by calling ``yarn run i18n-extract``, which Extraction is done by calling ``yarn run i18n-extract``, which
will pull all the strings from source files and put them in a PO file. will pull all the strings from source files and put them in a PO file.