From d747ce6d1cd206a087ef19f4a0ce2664b8026789 Mon Sep 17 00:00:00 2001
From: Yura Zenevich <yzenevich@mozilla.com>
Date: Thu, 19 Mar 2015 14:24:55 -0400
Subject: [PATCH] Bug 1144733 - fixing l10n collision in close button in Camera
 controls.

---
 apps/camera/js/views/controls.js            | 4 ++--
 apps/camera/locales/camera.en-US.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/camera/js/views/controls.js b/apps/camera/js/views/controls.js
index ea915027bd90..90fc502d5b7d 100644
--- a/apps/camera/js/views/controls.js
+++ b/apps/camera/js/views/controls.js
@@ -34,7 +34,7 @@ module.exports = View.extend({
 
   // {node}: {data-l10n-id} pairs used for localization.
   elsL10n: {
-    cancel: 'close-button',
+    cancel: 'controls-button-close',
     thumbnail: 'preview-button'
   },
 
@@ -269,7 +269,7 @@ module.exports = View.extend({
       '<div class="controls-button controls-thumbnail-button test-thumbnail js-thumbnail rotates" ' +
         'name="thumbnail" role="button" data-l10n-id="preview-button"></div>' +
       '<div class="controls-button controls-cancel-pick-button test-cancel-pick rotates js-cancel" ' +
-        'name="cancel" data-icon="close" role="button" data-l10n-id="close-button"></div>' +
+        'name="cancel" data-icon="close" role="button" data-l10n-id="controls-button-close"></div>' +
     '</div>' +
     '<div class="controls-middle">' +
       '<div class="capture-button test-capture rotates js-capture" name="capture">' +
diff --git a/apps/camera/locales/camera.en-US.properties b/apps/camera/locales/camera.en-US.properties
index 6fc32ca56312..9f5b6ae8daca 100644
--- a/apps/camera/locales/camera.en-US.properties
+++ b/apps/camera/locales/camera.en-US.properties
@@ -115,7 +115,7 @@ toggle-camera-rear-button.ariaLabel = Rear camera
 toggle-camera-front-button.ariaLabel = Front camera
 menu-button.ariaLabel = Menu
 preview-button.ariaLabel = Preview
-close-button.ariaLabel = Close
+controls-button-close.ariaLabel = Close
 share-button.ariaLabel = Share
 more-button.ariaLabel = More
 media-frame.ariaLabel = Frame {{current}} of {{total}}