From 83d63bf479c4ea2c85a31c2f4cb65d7bee0aa8bf Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 Mar 2015 15:52:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8=E4=B8=AD=E5=85=B3=E6=B3=A8=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contests/watcherlist.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/contests/watcherlist.html.erb b/app/views/contests/watcherlist.html.erb
index 4987f3616..5628e5e95 100644
--- a/app/views/contests/watcherlist.html.erb
+++ b/app/views/contests/watcherlist.html.erb
@@ -15,7 +15,7 @@
                 <tr>
                   <td colspan="2" width="580px" ><p class="font_description">
                     <% unless user.memberships.empty? %>
-                        <%= l(:label_contribute_to, :project_count => "#{user.memberships.count}") %>
+                        <%= l(:label_contribute_to, :count => "#{user.memberships.count}") %>
                         <% for member in user.memberships %>
                             <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
                         <% end %>

From 34579e395f2a1696ae7d3da89e043f29a6829461 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Fri, 20 Mar 2015 15:59:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9B=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E6=94=B6=E6=8B=89=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_form.html.erb        |  4 +++-
 app/views/attachments/_form_course.html.erb |  6 +++++-
 app/views/files/_attachement_list.html.erb  |  6 +++++-
 app/views/layouts/_base_feedback.html.erb   |  2 +-
 config/locales/projects/zh.yml              |  2 +-
 public/javascripts/attachments.js           | 14 ++++++--------
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index 39ef47b1b..c428522fe 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -62,7 +62,9 @@
             :upload_path => uploads_path(:format => 'js',:project =>project),
             :description_placeholder => l(:label_optional_description),
             :field_is_public => l(:field_is_public),
-            :are_you_sure => l(:text_are_you_sure)
+            :are_you_sure => l(:text_are_you_sure),
+            :file_count => l(:label_file_count),
+            :delete_all_files => l(:text_are_you_sure_all)
           } %>
     <span id="upload_file_count">
       <%= l(:label_no_file_uploaded)%>
diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb
index 43f99056b..301c49506 100644
--- a/app/views/attachments/_form_course.html.erb
+++ b/app/views/attachments/_form_course.html.erb
@@ -50,7 +50,11 @@
         :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
         :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
         :upload_path => uploads_path(:format => 'js'),
-        :description_placeholder => l(:label_optional_description)
+        :description_placeholder => l(:label_optional_description),
+        :field_is_public => l(:field_is_public),
+        :are_you_sure => l(:text_are_you_sure),
+        :file_count => l(:label_file_count),
+        :delete_all_files => l(:text_are_you_sure_all)
       } %>
 <span id="upload_file_count"><%= l(:label_no_file_uploaded)%></span>
 (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb
index 41025e619..6b9758fd2 100644
--- a/app/views/files/_attachement_list.html.erb
+++ b/app/views/files/_attachement_list.html.erb
@@ -34,7 +34,11 @@
                            :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
                            :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
                            :upload_path => uploads_path(:format => 'js'),
-                           :description_placeholder => l(:label_optional_description)
+                           :description_placeholder => l(:label_optional_description),
+                           :field_is_public => l(:field_is_public),
+                           :are_you_sure => l(:text_are_you_sure),
+                           :file_count => l(:label_file_count),
+                           :delete_all_files => l(:text_are_you_sure_all)
                    } %>
 <!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
 <label class="f_l ml10 c_grey" style=" margin-top: 3px;">
diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index bf6862244..2172af8de 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -89,7 +89,7 @@
 			closeBtn.bind("click",function(){
 				sideContent.animate({width: '0px'},"fast");
             	show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast");
-            	cookiesave('minStatue','false','','','');
+            	cookiesave('minStatue','true','','','');
 			});
 			//show???
 			 show_btn.bind("click",function() {
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 974dbb7ef..bf392ec98 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -134,7 +134,7 @@ zh:
 
   label_optional_description: 可选的描述
 
-
+  text_are_you_sure_all: 您确定要删除所有文件吗
   #   
   #  项目托管平台
   #
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 4ae3278b1..44aa7a404 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -15,19 +15,17 @@ function postUpMsg(attachmentId)
 function addFile(inputEl, file, eagerUpload) {
 
   if ($('#attachments_fields').children().length < 10) {
-      alert($(inputEl).data('description_placeholder'));
-      alert($(inputEl).data('field_is_public'));
-      alert($(inputEl).data('are_you_sure'));
+
     var attachmentId = addFile.nextAttachmentId++;
 
     var fileSpan = $('<span>', { 'id': 'attachments_' + attachmentId, 'class':'attachment' });
 
     fileSpan.append(
         $('<input>', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name),
-        $('<input>', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload),
-        $('<span >'+$(inputEl).data('field_is_public')+'</span>').attr({  'class': 'ispublic-label' }) ,
+        $('<input>', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('descriptionPlaceholder') } ).toggle(!eagerUpload),
+        $('<span >'+$(inputEl).data('fieldIsPublic')+':</span>').attr({  'class': 'ispublic-label' }) ,
         $('<input>', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', checked:'checked' } ).toggle(!eagerUpload),
-        $('<a>&nbsp</a>').attr({ 'href': "#", 'class': 'remove-upload', 'data-confirm' : "您确定要删除吗？" }).click(removeFile).toggle(!eagerUpload),
+        $('<a>&nbsp;&nbsp;&nbsp;</a>').attr({ 'href': "#", 'class': 'remove-upload', 'data-confirm' : $(inputEl).data('areYouSure') }).click(removeFile).toggle(!eagerUpload),
         $('<div>', {  'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} )
     ).appendTo('#attachments_fields');
 
@@ -88,7 +86,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
     //gcm files count and add delete_all link
 
     var count=$('#attachments_fields>span').length;
-    $('#upload_file_count').html("已上传"+"<span id=\"count\">"+count+"</span>"+"个文件");
+    $('#upload_file_count').html("<span id=\"count\">"+count+"</span>"+"个文件已上传");
     if(count>=1){
     	var add_attachs=$('.add_attachment');
     	var delete_all=$('.remove_all');	
@@ -122,7 +120,7 @@ function removeFile() {
 
 //gcm delete all file
 function removeAll(){
-	if(confirm("您确定要删除所有文件吗?")){
+	if(confirm("您确定要删除所有文件吗")){
 		$(".remove-upload").removeAttr("data-confirm");
 		$(".remove-upload").click();
 	}