diff --git a/documentation/translations/translating.rst b/documentation/translations/translating.rst index e75ccb93c..f651c11e3 100644 --- a/documentation/translations/translating.rst +++ b/documentation/translations/translating.rst @@ -4,6 +4,8 @@ Translating =========== +.. include:: /include/activate-tab.rst + .. highlight:: rest There are several documentation translations already @@ -393,8 +395,6 @@ messages, regardless of file paths. To use it, first install the package: Then, merge translations from a specific commit (replace :samp:`{COMMIT_HASH}` with the commit hash from before the files were moved): -.. TODO: Provide Windows instructions. - .. tab:: Unix .. code-block:: bash @@ -411,11 +411,39 @@ with the commit hash from before the files were moved): git checkout HEAD -- . # Merge translations from temporary dir back in + shopt -s globstar pomerge --from /tmp/old-po-files/**/*.po --to **/*.po --clear # Clean up temporary dir rm -rf /tmp/old-po-files +.. tab:: Windows + + .. code-block:: dosbatch + + rem These commands are to be run in the root of the translation repo + + rem Check out a commit before the move + git checkout COMMIT_HASH -- . + + rem Copy translations to a temporary dir + xcopy . %TEMP%\old-po-files\ /E /I /Q /Y + + rem Return to the current version + git checkout HEAD -- . + + rem Learn translations from temporary dir + for /R "%TEMP%\old-po-files" %F in (*.po) do pomerge --from "%F" + + rem Apply translations to current files + for /R . %F in (*.po) do pomerge --to "%F" + + rem Clean up translation memory + pomerge --clear + + rem Clean up temporary dir + rmdir /S /Q "%TEMP%\old-po-files" + After running ``pomerge``, review the changes and commit the updated files. You may also need to rewrap the lines (see :pypi:`powrap`).