treesame commit of origin/stable/2017-10-07

Treesame-Commit-Id: 6f6f0fd

app/models/canvadoc.rb

@@ -61,7 +61,7 @@ def has_annotations?
     account_context = attachment.context.try(:account)
     account_context ||= attachment.context.try(:root_account)
     new_annotations_enabled = account_context&.feature_enabled?(:new_annotations)
-    new_annotations_enabled || annotations == true
+    new_annotations_enabled || has_annotations == true
   end
 
   def self.mime_types

app/models/conditional_release/service.rb

@@ -125,7 +125,7 @@ def self.configured?
     end
 
     def self.enabled_in_context?(context)
-      !!(configured? && context.feature_enabled?(:conditional_release))
+      !!(configured? && context&.feature_enabled?(:conditional_release))
     end
 
     def self.protocol

config/locales/fr.yml

@@ -6749,7 +6749,7 @@ fr:
     tabs: 
       arrows: Flèches
       basic: Simple
-      delimiters: Délimiteurs
+      delimiters: "Délimiteurs SWmqwuiasuiyjsaq"
       greek: Grec
       misc: Divers
       operators: Opérateurs

spec/models/canvadoc_spec.rb

@@ -121,4 +121,16 @@ def disable_canvadocs
       expect(@doc).not_to be_available
     end
   end
+
+  describe "#has_annotations?" do
+    it "has annotations when true and new annotations are not enabled" do
+      @doc.has_annotations = true
+      expect(@doc).to have_annotations
+    end
+
+    it "does not have annotations when false and new annotations are not enabled" do
+      @doc.has_annotations = false
+      expect(@doc).not_to have_annotations
+    end
+  end
 end