From 641a81bf7ad436853525d734c0d41a0f1365ecd3 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 29 Mar 2019 01:05:03 +0000
Subject: [PATCH] Set CCAP language tag correctly.

---
 src/lib/reel_writer.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 8ed085dbd..3b9e413a2 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -569,18 +569,20 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track,
 		if (_film->interop ()) {
 			shared_ptr<dcp::InteropSubtitleAsset> s (new dcp::InteropSubtitleAsset ());
 			s->set_movie_title (_film->name ());
-			if (lang.empty()) {
-				s->set_language ("Unknown");
+			if (type == TEXT_OPEN_SUBTITLE) {
+				s->set_language (lang.empty() ? "Unknown" : lang);
 			} else {
-				s->set_language (lang);
+				s->set_language (track->language);
 			}
 			s->set_reel_number (raw_convert<string> (_reel_index + 1));
 			asset = s;
 		} else {
 			shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset ());
 			s->set_content_title_text (_film->name ());
-			if (!lang.empty()) {
+			if (type == TEXT_OPEN_SUBTITLE && !lang.empty()) {
 				s->set_language (lang);
+			} else {
+				s->set_language (track->language);
 			}
 			s->set_edit_rate (dcp::Fraction (_film->video_frame_rate (), 1));
 			s->set_reel_number (_reel_index + 1);
-- 
2.30.2