From 87afcc7d5fd08137c8e7e2a77c263e629f4e9154 Mon Sep 17 00:00:00 2001
From: Kenneth Skovhede <kenneth@hexad.dk>
Date: Thu, 23 Jun 2016 09:50:39 +0200
Subject: [PATCH] Fixed a few cosmetic S3 issues

---
 Duplicati/Library/Backend/S3/S3Backend.cs                | 3 ++-
 Duplicati/Server/webroot/ngax/templates/backends/s3.html | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Duplicati/Library/Backend/S3/S3Backend.cs b/Duplicati/Library/Backend/S3/S3Backend.cs
index df8f7fdd9..6860e663a 100644
--- a/Duplicati/Library/Backend/S3/S3Backend.cs
+++ b/Duplicati/Library/Backend/S3/S3Backend.cs
@@ -73,7 +73,8 @@ namespace Duplicati.Library.Backend
 
         static S3() {
             var ns = new List<KeyValuePair<string, string>> {
-                new KeyValuePair<string, string>("Standard", "STANDARD"),
+				new KeyValuePair<string, string>("(default)", ""),
+				new KeyValuePair<string, string>("Standard", "STANDARD"),
                 new KeyValuePair<string, string>("Infrequent Access (IA)", "STANDARD_IA"),
                 new KeyValuePair<string, string>("Glacier", "GLACIER"),
                 new KeyValuePair<string, string>("Reduced Redundancy Storage (RRS)", "REDUCED_REDUNDANCY"),
diff --git a/Duplicati/Server/webroot/ngax/templates/backends/s3.html b/Duplicati/Server/webroot/ngax/templates/backends/s3.html
index 0f0d508a2..a789eb905 100644
--- a/Duplicati/Server/webroot/ngax/templates/backends/s3.html
+++ b/Duplicati/Server/webroot/ngax/templates/backends/s3.html
@@ -37,11 +37,11 @@
 
     <label for="s3_storageclass">Storage class</label>
 
-    <select name="s3_storageclass" id="s3_storageclass" ng-model="$parent.s3_storageclass" ng-options="v as k + ' (' + v + ')' for (k, v) in s3_storageclass | orderBy: k" title="The storage class affects the availability and price for a stored file">
+    <select name="s3_storageclass" id="s3_storageclass" ng-model="$parent.s3_storageclass" ng-options="v as k + ' (' + v + ')' for (k, v) in s3_storageclasses | orderBy: k" title="The storage class affects the availability and price for a stored file">
         <option value="">Custom storage class</option>
     </select>
 
-    <input ng-hide="contains_value(s3_storageclasses, s3_storageclass)" type="text" id="s3_storageclass_custom" ng-model="$parent.s3_storageclass_custom" placeholder="Custom region for creating buckets"/>
+    <input ng-hide="contains_value(s3_storageclasses, s3_storageclass)" type="text" id="s3_storageclass_custom" ng-model="$parent.s3_storageclass_custom" placeholder="Custom bucket storage class"/>
 
 </div>