[MediaWiki-commits] [Gerrit] manually fix some bad tpl vars -- needs to be backported to ... - change (wikimedia...crm)

2014-02-26 Thread Mwalker (Code Review) 
Mwalker has submitted this change and it was merged.

Change subject: manually fix some bad tpl vars -- needs to be backported to 
upstream wiki
..


manually fix some bad tpl vars -- needs to be backported to upstream wiki

Change-Id: I8a593af488de16adef288073e46127d37225c0bd
---
M sites/all/modules/thank_you/templates/html/thank_you.sh.html
M sites/all/modules/thank_you/templates/html/thank_you.zh-tw.html
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Mwalker: Looks good to me, approved



diff --git a/sites/all/modules/thank_you/templates/html/thank_you.sh.html 
b/sites/all/modules/thank_you/templates/html/thank_you.sh.html
index 69c2c9f..75c8bef 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.sh.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.sh.html
@@ -81,7 +81,7 @@
 donacijama. Medjutim, ako ne želite da primate takvu elektronsku postu od nas, 
molimo Vas da
 kliknete na link odmah ispod i bićete uklonjeni sa tog spiska./p
   div style=margin: 0 25px
-p[$unsibscribeUrl Odjava]/p
+pa href={{ unsubscribe_link | raw }}Odjava/a/p
   /div
 /div
 
diff --git a/sites/all/modules/thank_you/templates/html/thank_you.zh-tw.html 
b/sites/all/modules/thank_you/templates/html/thank_you.zh-tw.html
index ec8e81f..4ca0f16 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.zh-tw.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.zh-tw.html
@@ -1,4 +1,4 @@
-p親愛的$firstname，/p
+p親愛的 {{ first_name }}，/p
 
 p維基有您真是太美好了。萬分感謝您願意支持：營運維基媒體與其他姊妹計畫的非營利組織，維基媒體基金會。/p
 

-- 
To view, visit https://gerrit.wikimedia.org/r/115325
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a593af488de16adef288073e46127d37225c0bd
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Adamw awi...@wikimedia.org
Gerrit-Reviewer: Mwalker mwal...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] manually fix some bad tpl vars -- needs to be backported to ... - change (wikimedia...crm)

2014-02-24 Thread Adamw (Code Review) 
Adamw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/115325

Change subject: manually fix some bad tpl vars -- needs to be backported to 
upstream wiki
..

manually fix some bad tpl vars -- needs to be backported to upstream wiki

Change-Id: I8a593af488de16adef288073e46127d37225c0bd
---
M sites/all/modules/thank_you/templates/html/thank_you.sh.html
M sites/all/modules/thank_you/templates/html/thank_you.vi.html
M sites/all/modules/thank_you/templates/html/thank_you.zh-tw.html
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/25/115325/1

diff --git a/sites/all/modules/thank_you/templates/html/thank_you.sh.html 
b/sites/all/modules/thank_you/templates/html/thank_you.sh.html
index f24a79c..ff240bf 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.sh.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.sh.html
@@ -82,7 +82,7 @@
 donacijama. Medjutim, ako ne želite da primate takvu elektronsku postu od nas, 
molimo Vas da
 kliknete na link odmah ispod i bićete uklonjeni sa tog spiska./p
   div style=margin: 0 25px
-p[$unsibscribeUrl Odjava]/p
+pa href={{ unsubscribe_link | raw }}Odjava/a/p
   /div
 /div
 
diff --git a/sites/all/modules/thank_you/templates/html/thank_you.vi.html 
b/sites/all/modules/thank_you/templates/html/thank_you.vi.html
index f75def5..3ac4e6b 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.vi.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.vi.html
@@ -67,7 +67,7 @@
 lược 5 năm của Wikimedia Foundation/a. Bạn cũng có thể mua hàng hóa của 
Wikipedia
 tại a href=https://shop.wikimedia.org;shop.wikimedia.org/a./p
 
-pThông tin để bạn lưu giữ: Khoản đóng góp của bạn là số $contributionsId,
+pThông tin để bạn lưu giữ: Khoản đóng góp của bạn là số {{ transaction_id }},
 vào ngày {{contribution.receive_date}}, với giá trị
 {{contribution.contribution_source|l10n_currency(locale)}}./p
 
diff --git a/sites/all/modules/thank_you/templates/html/thank_you.zh-tw.html 
b/sites/all/modules/thank_you/templates/html/thank_you.zh-tw.html
index de2a618..c755829 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.zh-tw.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.zh-tw.html
@@ -1,4 +1,4 @@
-p親愛的$firstname，/p
+p親愛的 {{ first_name }}，/p
 
 p維基有您真是太美好了。萬分感謝您願意支持：營運維基媒體與其他姊妹計畫的非營利組織，維基媒體基金會。/p
 

-- 
To view, visit https://gerrit.wikimedia.org/r/115325
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a593af488de16adef288073e46127d37225c0bd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Adamw awi...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits