Merge branch 'master' of github.com:okfn/ckan into 2750-add-docs-and-…

…examples-for-idatasetform-and-igroupform
ckan · Aug 1, 2012 · 90e9a2f · 90e9a2f
2 parents 4dbe119 + 9acc9ea
commit 90e9a2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ckan/public/scripts/templates.js b/ckan/public/scripts/templates.js
@@ -152,7 +152,7 @@ CKAN.Templates.resourceDetails = ' \
 CKAN.Templates.resourceExtra = ' \
   <div class="dynamic-extra"> \
   <button class="btn btn-danger remove-resource-extra">X</button>\
-  <input type="text" placeholder="Key" class="extra-key" value="${key}" /> \
-  <input type="text" placeholder="Value" class="extra-value" value="${value}" /> \
+  <input type="text" placeholder="'+CKAN.Strings.key+'" class="extra-key" value="${key}" /> \
+  <input type="text" placeholder="'+CKAN.Strings.value+'" class="extra-value" value="${value}" /> \
   </div> \
   ';
diff --git a/ckan/templates/js_strings.html b/ckan/templates/js_strings.html
@@ -63,6 +63,8 @@
       unknown = _('Unknown'),
       extraFields = _('Extra Fields'),
       addExtraField = _('Add Extra Field'),
+      key = _('Key'),
+      value = _('Value'),
       deleteResource = _('Delete Resource'),
       youCanUseMarkdown = _('You can use %aMarkdown formatting%b here.'),
       datesAreInISO = _('Dates are in %aISO Format%b &mdash; eg. %c2012-12-25%d or %c2010-05-31T14:30%d.'),