From 2a3dd7323fe7aa7a53cffe2783735b9d2252358d Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Thu, 18 Jul 2013 09:43:46 -0400
Subject: [PATCH 1/2] CMS i18n changes from Tsinghua

---
 cms/static/js/base.js               |  2 +-
 cms/templates/edit-static-page.html | 41 -----------------------------
 cms/templates/editable_preview.html | 13 ---------
 cms/templates/overview.html         |  2 +-
 4 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 cms/templates/edit-static-page.html
 delete mode 100644 cms/templates/editable_preview.html

diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index 329624ef4687..e9273e3864da 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -728,7 +728,7 @@ function saveSetSectionScheduleDate(e) {
         var $thisSection = $('.courseware-section[data-id="' + id + '"]');
         var html = _.template(
             '<span class="published-status">' +
-                '<strong>' + gettext("Will Release: ") + '</strong>' +
+                '<strong>' + gettext("Will Release:") + '</strong>' +
                 gettext("<%= date %> at <%= time %> UTC") +
             '</span>' +
             '<a href="#" class="edit-button" data-date="<%= date %>" data-time="<%= time %>" data-id="<%= id %>">' +
diff --git a/cms/templates/edit-static-page.html b/cms/templates/edit-static-page.html
deleted file mode 100644
index f1b2374b461b..000000000000
--- a/cms/templates/edit-static-page.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<%inherit file="base.html" />
-<%! from django.core.urlresolvers import reverse %>
-<%block name="title">Editing Static Page</%block>
-<%block name="bodyclass">is-signedin course pages edit-static-page</%block>
-
-<%block name="content">
-<div class="main-wrapper">
-  <div class="inner-wrapper">
-    <div class="main-column">
-      <article class="static-page-details">
-        <div class="row">
-          <label>Display Name:</label>
-          <input type="text" value="Syllabus" class="page-display-name-input" data-metadata-name="display_name"/>
-        </div>
-        <div class="row">
-          <label>Page Content:</label>
-          <textarea class="page-contents"></textarea>
-        </div>
-      </article>
-    </div>
-    <div class="sidebar">
-      <div class="unit-settings window">
-        <h4 class="header">Page Settings</h4>
-        <div class="window-contents">
-          <div class="row visibility">
-            <label class="inline-label">Visibility:</label>
-            <select>
-              <option>Public</option>
-              <option>Private</option>
-            </select>
-          </div>
-          <div class="row unit-actions">
-            <a href="#" class="save-button">Save</a>
-            <a href="#" target="_blank" class="preview-button">Preview</a>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-</%block>
\ No newline at end of file
diff --git a/cms/templates/editable_preview.html b/cms/templates/editable_preview.html
deleted file mode 100644
index 731fd9b1c8ca..000000000000
--- a/cms/templates/editable_preview.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<section class='editable-preview'>
-${content}
-<div class="component-actions">
-  <a href="#" class="edit-button"><span class="edit-icon white"></span>Edit</a>
-  <a href="#" class="delete-button"><span class="delete-icon white"></span>Delete</a>	
-</div>
-<a data-tooltip="Drag to reorder" href="#" class="drag-handle"></a>
-<div class="component-editor">
-  <h5>Edit Video Component</h5>
-  <textarea class="component-source"><video youtube="1.50:q1xkuPsOY6Q,1.25:9WOY2dHz5i4,1.0:4rpg8Bq6hb4,0.75:KLim9Xkp7IY"/></textarea>
-  <a href="#" class="save-button">Save</a><a href="#" class="cancel-button">Cancel</a>
-</div>
-<section>
diff --git a/cms/templates/overview.html b/cms/templates/overview.html
index 56836b00ad38..3795e9d09b50 100644
--- a/cms/templates/overview.html
+++ b/cms/templates/overview.html
@@ -1,4 +1,4 @@
-/<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import ugettext as _ %>
 <%inherit file="base.html" />
 <%!
    import logging

From 9056b096c6e49f43324259bea475e4821606ad0c Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Sat, 20 Jul 2013 11:10:01 -0400
Subject: [PATCH 2/2] add back removed space

---
 cms/static/js/base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index e9273e3864da..673fa6f314fb 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -728,7 +728,7 @@ function saveSetSectionScheduleDate(e) {
         var $thisSection = $('.courseware-section[data-id="' + id + '"]');
         var html = _.template(
             '<span class="published-status">' +
-                '<strong>' + gettext("Will Release:") + '</strong>' +
+                '<strong>' + gettext("Will Release:") + '&nbsp;</strong>' +
                 gettext("<%= date %> at <%= time %> UTC") +
             '</span>' +
             '<a href="#" class="edit-button" data-date="<%= date %>" data-time="<%= time %>" data-id="<%= id %>">' +