Merge branch 'release/10.0' into dev

app/views/messages/_form.html.erb

@@ -40,10 +40,10 @@ See docs/COPYRIGHT.rdoc for more details.
 </div>
 <% unless replying %>
   <div class="form--field">
-    <%= f.check_box :sticky, label: t(:label_board_sticky) %>
+    <%= f.check_box :sticky, label: I18n.t('js.label_board_sticky') %>
   </div>
   <div class="form--field">
-    <%= f.check_box :locked, label: t(:label_board_locked) %>
+    <%= f.check_box :locked, label: I18n.t('js.label_board_locked') %>
   </div>
 <% end %>
 <% if !replying && !@message.new_record? && User.current.allowed_to?(:edit_messages, @project) %>

frontend/src/app/modules/fields/display/field-types/wp-spent-time-display-field.module.ts

@@ -49,11 +49,12 @@ export class WorkPackageSpentTimeDisplayField extends DurationDisplayField {
     link.setAttribute('title', this.text.linkTitle);
 
     if (this.resource.project) {
+      const wpID = this.resource.id.toString();
       this.projectCacheService
         .require(this.resource.project.idFromLink)
         .then((project:ProjectResource) => {
           const href = URI(this.PathHelper.projectTimeEntriesPath(project.identifier))
-            .search({work_package_id: this.resource.id})
+            .search({work_package_id: wpID})
             .toString();
 
           link.href = href;