From 63d91f9a2675c30ccb379fd76ab2c32cd76bd3a9 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 19 Apr 2012 11:58:06 +1200
Subject: [PATCH] BUGFIX Fixing broken labels in UploadField

---
 lang/en.yml              | 2 +-
 templates/UploadField.ss | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lang/en.yml b/lang/en.yml
index c06477c02..aef466df5 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -561,7 +561,7 @@ en:
     DROPFILES: "drop files"
     EDITINFO: "Edit this file"
     FIELDNOTSET: "File information not found"
-    FROMCOMPUTER: "From files"
+    FROMCOMPUTER: "Upload from your computer"
     MAXNUMBEROFFILES: "Max number of %s file(s) exceeded."
     REMOVEERROR: "Error removing file"
     REMOVEINFO: "Remove this file from here, but do not delete it from the file store"
diff --git a/templates/UploadField.ss b/templates/UploadField.ss
index 380584be3..8ffca8803 100644
--- a/templates/UploadField.ss
+++ b/templates/UploadField.ss
@@ -47,7 +47,7 @@
 				<% _t('UploadField.FROMCOMPUTER', 'From your computer') %>
 				<input id="$id" name="$getName" class="$extraClass ss-uploadfield-fromcomputer-fileinput" data-config="$configString" type="file"<% if $multiple %> multiple="multiple"<% end_if %> />
 			</label>
-			<button class="ss-uploadfield-fromfiles ss-ui-button ui-corner-all" title="<% _t('UploadField.FROMCOMPUTERINFO', 'Select from from files') %>" data-icon="network-cloud"><% _t('UploadField.FROMCOMPUTER', 'From files') %></button>
+			<button class="ss-uploadfield-fromfiles ss-ui-button ui-corner-all" title="<% _t('UploadField.FROMCOMPUTERINFO', 'Select from files') %>" data-icon="network-cloud"><% _t('UploadField.FROMFILES', 'From files') %></button>
 			<% if not $autoUpload %>
 				<button class="ss-uploadfield-startall ss-ui-button ui-corner-all" title="<% _t('UploadField.STARTALLINFO', 'Start all uploads') %>" data-icon="navigation"><% _t('UploadField.STARTALL', 'Start all') %></button>
 			<% end_if %>
@@ -55,4 +55,4 @@
 		</div>
 		<div class="clear"><!-- --></div>
 	</div>
-<% end_if %>
\ No newline at end of file
+<% end_if %>