From ccba858ae183deec8d01110a083f108f0fc67c09 Mon Sep 17 00:00:00 2001
From: Adam Mills <adam@armills.info>
Date: Wed, 18 Apr 2018 15:58:47 -0400
Subject: [PATCH] Fix for Lokalise backend misinterpretation of keys (#13986)

The Lokalise server has a bug that the internal portion of key
references was misinterpreted as a symfony key, and was getting auto
converted by the convert placeholders feature. Since we don't use this
we're turning it off to work around the bug.
---
 .travis.yml                | 2 +-
 script/translations_upload | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fce86348817..bf2d05bb185 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ script: travis_wait 30 tox --develop
 services:
   - docker
 before_deploy:
-  - docker pull lokalise/lokalise-cli@sha256:79b3108211ed1fcc9f7b09a011bfc53c240fc2f3b7fa7f0c8390f593271b4cd7
+  - docker pull lokalise/lokalise-cli@sha256:2198814ebddfda56ee041a4b427521757dd57f75415ea9693696a64c550cef21
 deploy:
   skip_cleanup: true
   provider: script
diff --git a/script/translations_upload b/script/translations_upload
index 578cc8c0ccf..5bf9fe1e121 100755
--- a/script/translations_upload
+++ b/script/translations_upload
@@ -35,9 +35,10 @@ script/translations_upload_merge.py
 
 docker run \
     -v ${LOCAL_FILE}:/opt/src/${LOCAL_FILE} \
-    lokalise/lokalise-cli@sha256:79b3108211ed1fcc9f7b09a011bfc53c240fc2f3b7fa7f0c8390f593271b4cd7 lokalise \
+    lokalise/lokalise-cli@sha256:2198814ebddfda56ee041a4b427521757dd57f75415ea9693696a64c550cef21 lokalise \
     --token ${LOKALISE_TOKEN} \
     import ${PROJECT_ID} \
     --file /opt/src/${LOCAL_FILE} \
     --lang_iso ${LANG_ISO} \
+    --convert_placeholders 0 \
     --replace 1