From 64ad8f660f98d9cb25042511f29481d1e27d5f49 Mon Sep 17 00:00:00 2001
From: AndyButland <abutland73@gmail.com>
Date: Sat, 12 Mar 2016 19:17:51 +0100
Subject: [PATCH 1/2] Fixed issue with misasigned task assignee on send to
 translation

---
 src/umbraco.cms/businesslogic/task/Task.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/umbraco.cms/businesslogic/task/Task.cs b/src/umbraco.cms/businesslogic/task/Task.cs
index 678cd60225..294077370f 100644
--- a/src/umbraco.cms/businesslogic/task/Task.cs
+++ b/src/umbraco.cms/businesslogic/task/Task.cs
@@ -131,7 +131,7 @@ namespace umbraco.cms.businesslogic.task
             set
             {
                 _user = value;
-                TaskEntity.OwnerUserId = _user.Id;
+                TaskEntity.AssigneeUserId = _user.Id;
             }
         }
 

From e3411f7212b27b58aa7dcbf81c92f58920543088 Mon Sep 17 00:00:00 2001
From: AndyButland <abutland73@gmail.com>
Date: Sat, 12 Mar 2016 19:26:45 +0100
Subject: [PATCH 2/2] Provided a check that a language was selected when
 sending to translation such that a message is returned to the user rather
 than an unexpected error

---
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml |  1 +
 .../umbraco/config/lang/en_us.xml             |  1 +
 .../umbraco/dialogs/sendToTranslation.aspx.cs | 34 ++++++++++++-------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 0842755da3..55df243b81 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -1145,6 +1145,7 @@ To manage your website, simply open the Umbraco back office and start adding con
      To close a translation task, please go to the Details view and click the "Close" button.
     ]]></key>
     <key alias="pageHasBeenSendToTranslation">The page '%0%' has been send to translation</key>
+    <key alias="noLanguageSelected">Please select the language that the content should be translated into</key>
     <key alias="sendToTranslate">Send the page '%0%' to translation</key>
     <key alias="taskAssignedBy">Assigned by</key>
     <key alias="taskOpened">Task opened</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index ce25e990c8..2b06337be7 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -1149,6 +1149,7 @@ To manage your website, simply open the Umbraco back office and start adding con
      To close a translation task, please go to the Details view and click the "Close" button.
     ]]></key>
     <key alias="pageHasBeenSendToTranslation">The page '%0%' has been send to translation</key>
+    <key alias="noLanguageSelected">Please select the language that the content should be translated into</key>
     <key alias="sendToTranslate">Send the page '%0%' to translation</key>
     <key alias="taskAssignedBy">Assigned by</key>
     <key alias="taskOpened">Task opened</key>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs
index 80118b4836..c02baaaa7b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs
@@ -92,20 +92,30 @@ namespace umbraco.presentation.dialogs
 
         protected void doTranslation_Click(object sender, EventArgs e)
         {
-            // testing translate
-            cms.businesslogic.translation.Translation.MakeNew(
-                _currentPage,
-                getUser(),
-                BusinessLogic.User.GetUser(int.Parse(translator.SelectedValue)),
-                new cms.businesslogic.language.Language(int.Parse(language.SelectedValue)),
-                comment.Text, includeSubpages.Checked,
-                true);
+            int languageId;
+            if (int.TryParse(language.SelectedValue, out languageId))
+            {
+                cms.businesslogic.translation.Translation.MakeNew(
+                    _currentPage,
+                    getUser(),
+                    BusinessLogic.User.GetUser(int.Parse(translator.SelectedValue)),
+                    new cms.businesslogic.language.Language(languageId),
+                    comment.Text, includeSubpages.Checked,
+                    true);
 
-            pane_form.Visible = false;
-            pl_buttons.Visible = false;
+                pane_form.Visible = false;
+                pl_buttons.Visible = false;
 
-            feedback.Text = ui.Text("translation","pageHasBeenSendToTranslation", _currentPage.Text, base.getUser()) + "</p><p><a href=\"#\" onclick=\"" + ClientTools.Scripts.CloseModalWindow() + "\">" + ui.Text("defaultdialogs", "closeThisWindow") + "</a></p>";
-            feedback.type = uicontrols.Feedback.feedbacktype.success;
+                feedback.Text = ui.Text("translation", "pageHasBeenSendToTranslation", _currentPage.Text, base.getUser()) +
+                    "</p><p><a href=\"#\" onclick=\"" + ClientTools.Scripts.CloseModalWindow() + "\">" +
+                    ui.Text("defaultdialogs", "closeThisWindow") + "</a></p>";
+                feedback.type = uicontrols.Feedback.feedbacktype.success;
+            }
+            else
+            {
+                feedback.Text = ui.Text("translation", "noLanguageSelected");
+                feedback.type = uicontrols.Feedback.feedbacktype.error;
+            }
         }
     }
 }