Merge pull request #886 from ruben2020/master

Fix for *.ts conflict between TypeScript and Qt Translation files

lib/linguist/heuristics.rb

@@ -19,6 +19,9 @@ module Linguist
         if languages.all? { |l| ["Perl", "Prolog"].include?(l) }
           disambiguate_pl(data, languages)
         end
+        if languages.all? { |l| ["TypeScript", "XML"].include?(l) }
+          disambiguate_ts(data, languages)
+        end
       end
     end
 
@@ -40,6 +43,16 @@ module Linguist
       matches
     end
 
+    def self.disambiguate_ts(data, languages)
+      matches = []
+      if (data.include?("</translation>"))
+        matches << Language["XML"]
+      else
+        matches << Language["TypeScript"]
+      end
+      matches
+    end
+
     def self.active?
       !!ACTIVE
     end