Put subtitle language back into content from the film (#1930).

This also adds the main/additional language flag.

Of all the considerations about how to specify subtitle language,
the most important seems to be that the language specification happens
for the content where the language is; i.e. in the content text tab.

11 files changed, 150 insertions, 201 deletions

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 6de9e3d75..3304f4d3c 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -456,6 +456,8 @@ DCPPanel::film_content_changed (int property)
 	if (property == AudioContentProperty::STREAMS ||
 	    property == TextContentProperty::USE ||
 	    property == TextContentProperty::BURN ||
+	    property == TextContentProperty::LANGUAGE ||
+	    property == TextContentProperty::LANGUAGE_IS_ADDITIONAL ||
 	    property == VideoContentProperty::SCALE ||
 	    property == DCPContentProperty::REFERENCE_VIDEO ||
 	    property == DCPContentProperty::REFERENCE_AUDIO ||
diff --git a/src/wx/dcp_text_track_dialog.cc b/src/wx/dcp_text_track_dialog.cc
index 3e8750cd5..b884aba51 100644
--- a/src/wx/dcp_text_track_dialog.cc
+++ b/src/wx/dcp_text_track_dialog.cc
@@ -43,5 +43,6 @@ DCPTextTrackDialog::DCPTextTrackDialog (wxWindow* parent)
 DCPTextTrack
 DCPTextTrackDialog::get () const
 {
-	return DCPTextTrack(wx_to_std(_name->GetValue()), _language->get().to_string());
+	DCPOMATIC_ASSERT (_language->get());
+	return DCPTextTrack(wx_to_std(_name->GetValue()), _language->get()->to_string());
 }
diff --git a/src/wx/interop_metadata_dialog.cc b/src/wx/interop_metadata_dialog.cc
index 7976e6d44..aa61984b3 100644
--- a/src/wx/interop_metadata_dialog.cc
+++ b/src/wx/interop_metadata_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,14 +18,16 @@
 
 */
 
-#include "interop_metadata_dialog.h"
+
 #include "editable_list.h"
+#include "interop_metadata_dialog.h"
 #include "language_tag_widget.h"
 #include "rating_dialog.h"
 #include "lib/film.h"
 #include <dcp/types.h>
 #include <wx/gbsizer.h>
 
+
 using std::string;
 using std::vector;
 using std::weak_ptr;
@@ -35,42 +37,25 @@ using namespace boost::placeholders;
 #endif
 
 
-static string
-column (dcp::Rating r, int c)
-{
-	if (c == 0) {
-		return r.agency;
-	}
-
-	return r.label;
-}
-
 InteropMetadataDialog::InteropMetadataDialog (wxWindow* parent, weak_ptr<Film> film)
 	: wxDialog (parent, wxID_ANY, _("Metadata"))
 	, _film (film)
 {
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	auto overall_sizer = new wxBoxSizer (wxVERTICAL);
 	SetSizer (overall_sizer);
 
-	wxFlexGridSizer* sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	auto sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 	sizer->AddGrowableCol (1, 1);
 
-	shared_ptr<Film> f = _film.lock();
+	auto f = _film.lock();
 	DCPOMATIC_ASSERT (f);
 
-	_enable_subtitle_language = new wxCheckBox (this, wxID_ANY, _("Subtitle language"));
-	sizer->Add (_enable_subtitle_language, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
-	vector<dcp::LanguageTag> langs = f->subtitle_languages ();
-	_enable_subtitle_language->SetValue (!langs.empty());
-	_subtitle_language = new LanguageTagWidget (this, wxT(""), langs.empty() ? dcp::LanguageTag("en-US") : langs.front());
-	sizer->Add (_subtitle_language->sizer(), 1, wxEXPAND);
-
 	{
 		int flags = wxALIGN_TOP | wxLEFT | wxRIGHT | wxTOP;
 #ifdef __WXOSX__
 		flags |= wxALIGN_RIGHT;
 #endif
-		wxStaticText* m = create_label (this, _("Ratings"), true);
+		auto m = create_label (this, _("Ratings"), true);
 		sizer->Add (m, 0, flags, DCPOMATIC_SIZER_GAP);
 	}
 
@@ -82,7 +67,12 @@ InteropMetadataDialog::InteropMetadataDialog (wxWindow* parent, weak_ptr<Film> f
 		columns,
 		boost::bind(&InteropMetadataDialog::ratings, this),
 		boost::bind(&InteropMetadataDialog::set_ratings, this, _1),
-		boost::bind(&column, _1, _2),
+		[](dcp::Rating r, int c) {
+			if (c == 0) {
+				return r.agency;
+			}
+			return r.label;
+		},
 		true,
 		false
 		);
@@ -92,12 +82,12 @@ InteropMetadataDialog::InteropMetadataDialog (wxWindow* parent, weak_ptr<Film> f
 	_content_version = new wxTextCtrl (this, wxID_ANY);
 	sizer->Add (_content_version, 1, wxEXPAND);
 
-	vector<string> cv = f->content_versions();
+	auto cv = f->content_versions();
 	_content_version->SetValue (std_to_wx(cv.empty() ? "" : cv[0]));
 
 	overall_sizer->Add (sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE);
+	auto buttons = CreateSeparatedButtonSizer (wxCLOSE);
 	if (buttons) {
 		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
@@ -105,45 +95,15 @@ InteropMetadataDialog::InteropMetadataDialog (wxWindow* parent, weak_ptr<Film> f
 	overall_sizer->Layout ();
 	overall_sizer->SetSizeHints (this);
 
-	_enable_subtitle_language->Bind (wxEVT_CHECKBOX, boost::bind(&InteropMetadataDialog::setup_sensitivity, this));
-	_subtitle_language->Changed.connect (boost::bind(&InteropMetadataDialog::subtitle_language_changed, this, _1));
-
 	_content_version->Bind (wxEVT_TEXT, boost::bind(&InteropMetadataDialog::content_version_changed, this));
 	_content_version->SetFocus ();
-
-	setup_sensitivity ();
-}
-
-
-void
-InteropMetadataDialog::setup_sensitivity ()
-{
-	bool const enabled = _enable_subtitle_language->GetValue();
-	_subtitle_language->enable (enabled);
-
-	shared_ptr<Film> film = _film.lock ();
-	DCPOMATIC_ASSERT (film);
-	if (enabled) {
-		film->set_subtitle_language (_subtitle_language->get());
-	} else {
-		film->unset_subtitle_language ();
-	}
-}
-
-
-void
-InteropMetadataDialog::subtitle_language_changed (dcp::LanguageTag language)
-{
-	shared_ptr<Film> film = _film.lock ();
-	DCPOMATIC_ASSERT (film);
-	film->set_subtitle_language (language);
 }
 
 
 vector<dcp::Rating>
 InteropMetadataDialog::ratings () const
 {
-	shared_ptr<Film> film = _film.lock ();
+	auto film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
 	return film->ratings ();
 }
@@ -151,7 +111,7 @@ InteropMetadataDialog::ratings () const
 void
 InteropMetadataDialog::set_ratings (vector<dcp::Rating> r)
 {
-	shared_ptr<Film> film = _film.lock ();
+	auto film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
 	film->set_ratings (r);
 }
@@ -159,7 +119,7 @@ InteropMetadataDialog::set_ratings (vector<dcp::Rating> r)
 void
 InteropMetadataDialog::content_version_changed ()
 {
-	shared_ptr<Film> film = _film.lock ();
+	auto film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
 	vector<string> cv;
 	cv.push_back (wx_to_std(_content_version->GetValue()));
diff --git a/src/wx/interop_metadata_dialog.h b/src/wx/interop_metadata_dialog.h
index 6e4eea40e..b8a1a36e6 100644
--- a/src/wx/interop_metadata_dialog.h
+++ b/src/wx/interop_metadata_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,12 +18,14 @@
 
 */
 
+
 #include "editable_list.h"
 #include <dcp/language_tag.h>
 #include <dcp/types.h>
 #include <wx/wx.h>
 #include <vector>
 
+
 class Film;
 class LanguageTagWidget;
 class RatingDialog;
@@ -38,12 +40,8 @@ private:
 	std::vector<dcp::Rating> ratings () const;
 	void set_ratings (std::vector<dcp::Rating> r);
 	void content_version_changed ();
-	void setup_sensitivity ();
-	void subtitle_language_changed (dcp::LanguageTag tag);
 
 	std::weak_ptr<Film> _film;
-	wxCheckBox* _enable_subtitle_language;
-	LanguageTagWidget* _subtitle_language;
 	EditableList<dcp::Rating, RatingDialog>* _ratings;
 	wxTextCtrl* _content_version;
 };
diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc
index 96e7c5283..c72c64b31 100644
--- a/src/wx/language_tag_dialog.cc
+++ b/src/wx/language_tag_dialog.cc
@@ -125,6 +125,7 @@ LanguageTagDialog::set (dcp::LanguageTag tag)
 	}
 
 	_list->SetItemState (selection, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+	_list->EnsureVisible (selection);
 }
 
 
diff --git a/src/wx/language_tag_widget.cc b/src/wx/language_tag_widget.cc
index d71b5fc7a..f0766c9d6 100644
--- a/src/wx/language_tag_widget.cc
+++ b/src/wx/language_tag_widget.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -26,13 +26,24 @@
 #include <wx/wx.h>
 
 
-LanguageTagWidget::LanguageTagWidget (wxWindow* parent, wxString tooltip, dcp::LanguageTag tag)
+using boost::optional;
+
+
+LanguageTagWidget::LanguageTagWidget (wxWindow* parent, wxString tooltip, optional<dcp::LanguageTag> tag, optional<wxString> size_to_fit)
 	: _parent (parent)
 	, _sizer (new wxBoxSizer(wxHORIZONTAL))
 {
-	_language = new wxStaticText (parent, wxID_ANY, wxT(""));
+	_language = new wxStaticText (parent, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
 	_language->SetToolTip (tooltip);
 	set (tag);
+
+	if (size_to_fit) {
+		int w;
+		int h;
+		_language->GetTextExtent (*size_to_fit, &w, &h);
+		_language->SetMinSize (wxSize(w, -1));
+	}
+
 	_sizer->Add (_language, 1, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
 	_edit = new Button (parent, _("Edit..."));
 	_sizer->Add (_edit, 0, wxLEFT, DCPOMATIC_SIZER_GAP);
@@ -41,10 +52,17 @@ LanguageTagWidget::LanguageTagWidget (wxWindow* parent, wxString tooltip, dcp::L
 }
 
 
+LanguageTagWidget::~LanguageTagWidget ()
+{
+	_language->Destroy ();
+	_edit->Destroy ();
+}
+
+
 void
 LanguageTagWidget::edit ()
 {
-	auto d = new LanguageTagDialog(_parent, _tag);
+	auto d = new LanguageTagDialog(_parent, _tag.get_value_or(dcp::LanguageTag("en")));
 	d->ShowModal ();
 	set (d->get());
 	Changed (d->get());
@@ -53,10 +71,14 @@ LanguageTagWidget::edit ()
 
 
 void
-LanguageTagWidget::set (dcp::LanguageTag tag)
+LanguageTagWidget::set (optional<dcp::LanguageTag> tag)
 {
 	_tag = tag;
-	checked_set (_language, std_to_wx(tag.to_string()));
+	if (tag) {
+		checked_set (_language, std_to_wx(tag->to_string()));
+	} else {
+		checked_set (_language, wxT(""));
+	}
 }
 
 
diff --git a/src/wx/language_tag_widget.h b/src/wx/language_tag_widget.h
index 336f7dce2..c2fd63d92 100644
--- a/src/wx/language_tag_widget.h
+++ b/src/wx/language_tag_widget.h
@@ -34,16 +34,17 @@ class wxWindow;
 class LanguageTagWidget : public boost::noncopyable
 {
 public:
-	LanguageTagWidget (wxWindow* parent, wxString tooltip, dcp::LanguageTag tag);
+	LanguageTagWidget (wxWindow* parent, wxString tooltip, boost::optional<dcp::LanguageTag> tag, boost::optional<wxString> size_to_fit = boost::none);
+	~LanguageTagWidget ();
 
 	wxSizer* sizer () const {
 		return _sizer;
 	}
 
-	dcp::LanguageTag get () const {
+	boost::optional<dcp::LanguageTag> get () const {
 		return _tag;
 	}
-	void set (dcp::LanguageTag tag);
+	void set (boost::optional<dcp::LanguageTag> tag);
 	void enable (bool e);
 
 	boost::signals2::signal<void (dcp::LanguageTag)> Changed;
@@ -54,7 +55,7 @@ private:
 	wxStaticText* _language;
 	wxButton* _edit;
 	wxWindow* _parent;
-	dcp::LanguageTag _tag;
+	boost::optional<dcp::LanguageTag> _tag;
 	wxSizer* _sizer;
 };
 
diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc
index 36cf48489..470e9317e 100644
--- a/src/wx/smpte_metadata_dialog.cc
+++ b/src/wx/smpte_metadata_dialog.cc
@@ -91,38 +91,6 @@ SMPTEMetadataDialog::main_panel (wxWindow* parent)
 		);
 	sizer->Add (_audio_language->sizer(), 0, wxEXPAND);
 
-	_enable_main_subtitle_language = new wxCheckBox (panel, wxID_ANY, _("Main subtitle language"));
-	sizer->Add (_enable_main_subtitle_language, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
-	auto subtitle_languages = film()->subtitle_languages();
-	_main_subtitle_language = new LanguageTagWidget(
-		panel,
-		_("The main language that is displayed in the film's subtitles"),
-		subtitle_languages.empty() ? dcp::LanguageTag("en-US") : subtitle_languages.front()
-		);
-	sizer->Add (_main_subtitle_language->sizer(), 0, wxEXPAND);
-
-	{
-		int flags = wxALIGN_TOP | wxRIGHT | wxTOP;
-#ifdef __WXOSX__
-		flags |= wxALIGN_RIGHT;
-#endif
-		auto m = create_label (panel, _("Additional subtitle languages"), true);
-		sizer->Add (m, 0, flags, DCPOMATIC_SIZER_GAP);
-	}
-
-	vector<EditableListColumn> columns;
-	columns.push_back (EditableListColumn("Language", 250, true));
-	_additional_subtitle_languages = new EditableList<dcp::LanguageTag, LanguageTagDialog> (
-		panel,
-		columns,
-		boost::bind(&SMPTEMetadataDialog::additional_subtitle_languages, this),
-		boost::bind(&SMPTEMetadataDialog::set_additional_subtitle_languages, this, _1),
-		boost::bind(&additional_subtitle_language_column, _1, _2),
-		true,
-		false
-		);
-	sizer->Add (_additional_subtitle_languages, 1, wxEXPAND);
-
 	{
 		int flags = wxALIGN_TOP | wxRIGHT | wxTOP;
 #ifdef __WXOSX__
@@ -132,7 +100,7 @@ SMPTEMetadataDialog::main_panel (wxWindow* parent)
 		sizer->Add (m, 0, flags, DCPOMATIC_SIZER_GAP);
 	}
 
-	columns.clear ();
+	vector<EditableListColumn> columns;
 	columns.push_back (EditableListColumn("Agency", 200, true));
 	columns.push_back (EditableListColumn("Label", 50, true));
 	_ratings = new EditableList<dcp::Rating, RatingDialog> (
@@ -267,9 +235,7 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr<Film> weak_
 
 	_name_language->Changed.connect (boost::bind(&SMPTEMetadataDialog::name_language_changed, this, _1));
 	_audio_language->Changed.connect (boost::bind(&SMPTEMetadataDialog::audio_language_changed, this, _1));
-	_enable_main_subtitle_language->Bind (wxEVT_CHECKBOX, boost::bind(&SMPTEMetadataDialog::enable_main_subtitle_changed, this));
 	_edit_release_territory->Bind (wxEVT_BUTTON, boost::bind(&SMPTEMetadataDialog::edit_release_territory, this));
-	_main_subtitle_language->Changed.connect (boost::bind(&SMPTEMetadataDialog::main_subtitle_language_changed, this, _1));
 	_version_number->Bind (wxEVT_SPINCTRL, boost::bind(&SMPTEMetadataDialog::version_number_changed, this));
 	_status->Bind (wxEVT_CHOICE, boost::bind(&SMPTEMetadataDialog::status_changed, this));
 	_enable_chain->Bind (wxEVT_CHECKBOX, boost::bind(&SMPTEMetadataDialog::enable_chain_changed, this));
@@ -362,14 +328,6 @@ SMPTEMetadataDialog::film_changed (ChangeType type, Film::Property property)
 			checked_set (_luminance_value, 4.5);
 			checked_set (_luminance_unit, 1);
 		}
-	} else if (property == Film::Property::SUBTITLE_LANGUAGES) {
-		auto languages = film()->subtitle_languages();
-		checked_set (_enable_main_subtitle_language, !languages.empty());
-		if (!languages.empty()) {
-			_main_subtitle_language->set (languages.front());
-		} else {
-			_main_subtitle_language->set (dcp::LanguageTag("en-US"));
-		}
 	}
 }
 
@@ -496,20 +454,6 @@ SMPTEMetadataDialog::luminance_changed ()
 
 
 void
-SMPTEMetadataDialog::enable_main_subtitle_changed ()
-{
-	setup_sensitivity ();
-	if (_enable_main_subtitle_language->GetValue()) {
-		film()->set_subtitle_language (_main_subtitle_language->get());
-	} else {
-		set_additional_subtitle_languages (vector<dcp::LanguageTag>());
-		_additional_subtitle_languages->refresh ();
-		film()->unset_subtitle_language ();
-	}
-}
-
-
-void
 SMPTEMetadataDialog::setup_sensitivity ()
 {
 	{
@@ -521,49 +465,6 @@ SMPTEMetadataDialog::setup_sensitivity ()
 	_chain->Enable (_enable_chain->GetValue());
 	_distributor->Enable (_enable_distributor->GetValue());
 	_facility->Enable (_enable_facility->GetValue());
-
-	{
-		auto const enabled = _enable_main_subtitle_language->GetValue();
-		_main_subtitle_language->enable (enabled);
-		_additional_subtitle_languages->Enable (enabled);
-	}
-}
-
-
-void
-SMPTEMetadataDialog::main_subtitle_language_changed (dcp::LanguageTag tag)
-{
-	auto existing = film()->subtitle_languages();
-	if (existing.empty()) {
-		existing.push_back (tag);
-	} else {
-		existing[0] = tag;
-	}
-
-	film()->set_subtitle_languages (existing);
-}
-
-
-vector<dcp::LanguageTag>
-SMPTEMetadataDialog::additional_subtitle_languages ()
-{
-	auto all = film()->subtitle_languages();
-	if (all.empty()) {
-		return all;
-	}
-
-	return vector<dcp::LanguageTag>(all.begin() + 1, all.end());
-}
-
-
-void
-SMPTEMetadataDialog::set_additional_subtitle_languages (vector<dcp::LanguageTag> languages)
-{
-	auto all = film()->subtitle_languages();
-	DCPOMATIC_ASSERT (!all.empty());
-	all.resize (1);
-	copy (languages.begin(), languages.end(), back_inserter(all));
-	film()->set_subtitle_languages (all);
 }
 
 
diff --git a/src/wx/smpte_metadata_dialog.h b/src/wx/smpte_metadata_dialog.h
index 63d90249c..83c1ab39c 100644
--- a/src/wx/smpte_metadata_dialog.h
+++ b/src/wx/smpte_metadata_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "editable_list.h"
 #include "full_language_tag_dialog.h"
 #include "lib/film.h"
@@ -49,10 +50,6 @@ private:
 	void set_content_versions (std::vector<std::string> v);
 	void name_language_changed (dcp::LanguageTag tag);
 	void audio_language_changed (dcp::LanguageTag tag);
-	void enable_main_subtitle_changed ();
-	void main_subtitle_language_changed (dcp::LanguageTag tag);
-	std::vector<dcp::LanguageTag> additional_subtitle_languages ();
-	void set_additional_subtitle_languages (std::vector<dcp::LanguageTag> languages);
 	void edit_release_territory ();
 	void version_number_changed ();
 	void status_changed ();
@@ -69,9 +66,6 @@ private:
 
 	LanguageTagWidget* _name_language;
 	LanguageTagWidget* _audio_language;
-	wxCheckBox* _enable_main_subtitle_language;
-	LanguageTagWidget* _main_subtitle_language;
-	EditableList<dcp::LanguageTag, LanguageTagDialog>* _additional_subtitle_languages;
 	wxCheckBox* _enable_release_territory;
 	/** The current release territory displayed in the UI; since we can't easily convert
 	 *  the string in _release_territory_text to a RegionSubtag we just store the RegionSubtag
diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 3b617a031..5e00d4f41 100644
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -18,7 +18,6 @@
 
 */
 
-
 #include "check_box.h"
 #include "content_panel.h"
 #include "dcp_text_track_dialog.h"
@@ -27,6 +26,7 @@
 #include "film_editor.h"
 #include "film_viewer.h"
 #include "fonts_dialog.h"
+#include "language_tag_widget.h"
 #include "static_text.h"
 #include "subtitle_appearance_dialog.h"
 #include "text_panel.h"
@@ -153,7 +153,7 @@ TextPanel::setup_visibility ()
 	case TextType::OPEN_SUBTITLE:
 		if (_dcp_track_label) {
 			_dcp_track_label->Destroy ();
-			_dcp_track_label = 0;
+			_dcp_track_label = nullptr;
 		}
 		if (_dcp_track) {
 			_dcp_track->Destroy ();
@@ -164,23 +164,51 @@ TextPanel::setup_visibility ()
 			_outline_subtitles->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::outline_subtitles_changed, this));
 			_grid->Add (_outline_subtitles, wxGBPosition(_outline_subtitles_row, 0), wxGBSpan(1, 2));
 		}
-
+		if (!_language) {
+			_language_label = create_label (this, _("Language"), true);
+			add_label_to_sizer (_grid, _language_label, true, wxGBPosition(_ccap_track_or_language_row, 0));
+			_language_sizer = new wxBoxSizer (wxHORIZONTAL);
+			_language = new LanguageTagWidget (this, _("Language of these subtitles"), boost::none, wxString("en-US-"));
+			_language->Changed.connect (boost::bind(&TextPanel::language_changed, this));
+			_language_sizer->Add (_language->sizer(), 1, wxRIGHT, DCPOMATIC_SIZER_GAP);
+			_language_type = new wxChoice (this, wxID_ANY);
+			/// TRANSLATORS: Main and Additional here are a choice for whether a set of subtitles is in the "main" language of the
+			/// film or an "additional" language.
+			_language_type->Append (_("Main"));
+			_language_type->Append (_("Additional"));
+			_language_type->Bind (wxEVT_CHOICE, boost::bind(&TextPanel::language_is_additional_changed, this));
+			_language_sizer->Add (_language_type, 0);
+			_grid->Add (_language_sizer, wxGBPosition(_ccap_track_or_language_row, 1), wxGBSpan(1, 2));
+			film_content_changed (TextContentProperty::LANGUAGE);
+			film_content_changed (TextContentProperty::LANGUAGE_IS_ADDITIONAL);
+		}
 		break;
 	case TextType::CLOSED_CAPTION:
+		if (_language_label) {
+			_language_label->Destroy ();
+			_language_label = nullptr;
+			_grid->Remove (_language->sizer());
+			delete _language;
+			_grid->Remove (_language_sizer);
+			_language_sizer = nullptr;
+			_language = nullptr;
+			_language_type->Destroy ();
+			_language_type = nullptr;
+		}
 		if (!_dcp_track_label) {
 			_dcp_track_label = create_label (this, _("CCAP track"), true);
-			add_label_to_sizer (_grid, _dcp_track_label, true, wxGBPosition(_ccap_track_row, 0));
+			add_label_to_sizer (_grid, _dcp_track_label, true, wxGBPosition(_ccap_track_or_language_row, 0));
 		}
 		if (!_dcp_track) {
 			_dcp_track = new wxChoice (this, wxID_ANY);
 			_dcp_track->Bind (wxEVT_CHOICE, boost::bind(&TextPanel::dcp_track_changed, this));
-			_grid->Add (_dcp_track, wxGBPosition(_ccap_track_row, 1), wxDefaultSpan, wxEXPAND);
+			_grid->Add (_dcp_track, wxGBPosition(_ccap_track_or_language_row, 1), wxDefaultSpan, wxEXPAND);
 			update_dcp_tracks ();
 			film_content_changed (TextContentProperty::DCP_TRACK);
 		}
 		if (_outline_subtitles) {
 			_outline_subtitles->Destroy ();
-			_outline_subtitles = 0;
+			_outline_subtitles = nullptr;
 			clear_outline_subtitles ();
 		}
 		break;
@@ -249,14 +277,14 @@ TextPanel::add_to_grid ()
 
 	{
 		add_label_to_sizer (_grid, _line_spacing_label, true, wxGBPosition (r, 0));
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		auto s = new wxBoxSizer (wxHORIZONTAL);
 		s->Add (_line_spacing);
 		add_label_to_sizer (s, _line_spacing_pc_label, false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
 		_grid->Add (s, wxGBPosition (r, 1));
 		++r;
 	}
 
-	_ccap_track_row = r;
+	_ccap_track_or_language_row = r;
 	++r;
 
 	add_label_to_sizer (_grid, _stream_label, true, wxGBPosition (r, 0));
@@ -454,6 +482,14 @@ TextPanel::film_content_changed (int property)
 		if (_dcp_track) {
 			update_dcp_track_selection ();
 		}
+	} else if (property == TextContentProperty::LANGUAGE) {
+		if (_language) {
+			_language->set (text ? text->language() : boost::none);
+		}
+	} else if (property == TextContentProperty::LANGUAGE_IS_ADDITIONAL) {
+		if (_language_type) {
+			_language_type->SetSelection (text ? (text->language_is_additional() ? 1 : 0) : 0);
+		}
 	} else if (property == DCPContentProperty::REFERENCE_TEXT) {
 		if (scs) {
 			auto dcp = dynamic_pointer_cast<DCPContent> (scs);
@@ -526,10 +562,10 @@ TextPanel::setup_sensitivity ()
 	auto sel = _parent->selected_text ();
 	for (auto i: sel) {
 		/* These are the content types that could include subtitles */
-		auto fc = std::dynamic_pointer_cast<const FFmpegContent> (i);
-		auto sc = std::dynamic_pointer_cast<const StringTextFileContent> (i);
-		auto dc = std::dynamic_pointer_cast<const DCPContent> (i);
-		auto dsc = std::dynamic_pointer_cast<const DCPSubtitleContent> (i);
+		auto fc = std::dynamic_pointer_cast<const FFmpegContent>(i);
+		auto sc = std::dynamic_pointer_cast<const StringTextFileContent>(i);
+		auto dc = std::dynamic_pointer_cast<const DCPContent>(i);
+		auto dsc = std::dynamic_pointer_cast<const DCPSubtitleContent>(i);
 		if (fc) {
 			if (!fc->text.empty()) {
 				++ffmpeg_subs;
@@ -548,7 +584,7 @@ TextPanel::setup_sensitivity ()
 
 	shared_ptr<DCPContent> dcp;
 	if (sel.size() == 1) {
-		dcp = dynamic_pointer_cast<DCPContent> (sel.front ());
+		dcp = dynamic_pointer_cast<DCPContent>(sel.front());
 	}
 
 	string why_not;
@@ -563,7 +599,7 @@ TextPanel::setup_sensitivity ()
 
 	bool const reference = _reference->GetValue ();
 
-	TextType const type = current_type ();
+	auto const type = current_type ();
 
 	/* Set up _type */
 	_type->Clear ();
@@ -618,7 +654,7 @@ TextPanel::stream_changed ()
 
 	auto a = fcs->subtitle_streams ();
 	auto i = a.begin ();
-	auto const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ()));
+	auto const s = string_client_data (_stream->GetClientObject(_stream->GetSelection()));
 	while (i != a.end() && (*i)->identifier () != s) {
 		++i;
 	}
@@ -688,6 +724,8 @@ TextPanel::content_selection_changed ()
 	film_content_changed (TextContentProperty::FONTS);
 	film_content_changed (TextContentProperty::TYPE);
 	film_content_changed (TextContentProperty::DCP_TRACK);
+	film_content_changed (TextContentProperty::LANGUAGE);
+	film_content_changed (TextContentProperty::LANGUAGE_IS_ADDITIONAL);
 	film_content_changed (DCPContentProperty::REFERENCE_TEXT);
 }
 
@@ -697,7 +735,7 @@ TextPanel::text_view_clicked ()
 {
 	if (_text_view) {
 		_text_view->Destroy ();
-		_text_view = 0;
+		_text_view = nullptr;
 	}
 
 	auto c = _parent->selected_text ();
@@ -759,7 +797,6 @@ TextPanel::appearance_dialog_clicked ()
 }
 
 
-
 /** The user has clicked on the outline subtitles check box */
 void
 TextPanel::outline_subtitles_changed ()
@@ -882,3 +919,27 @@ TextPanel::analysis_finished ()
 	try_to_load_analysis ();
 }
 
+
+void
+TextPanel::language_changed ()
+{
+	for (auto i: _parent->selected_text()) {
+		auto t = i->text_of_original_type(_original_type);
+		if (t) {
+			t->set_language (_language->get());
+		}
+	}
+}
+
+
+void
+TextPanel::language_is_additional_changed ()
+{
+	for (auto i: _parent->selected_text()) {
+		auto t = i->text_of_original_type(_original_type);
+		if (t) {
+			t->set_language_is_additional (_language_type->GetSelection() == 1);
+		}
+	}
+}
+
diff --git a/src/wx/text_panel.h b/src/wx/text_panel.h
index 7f38ff42b..7337e5258 100644
--- a/src/wx/text_panel.h
+++ b/src/wx/text_panel.h
@@ -23,6 +23,8 @@
 
 
 class wxCheckBox;
+class wxSpinCtrl;
+class LanguageTagWidget;
 class TextView;
 class FontsDialog;
 class SpinCtrl;
@@ -60,6 +62,8 @@ private:
 	void add_to_grid ();
 	void try_to_load_analysis ();
 	void analysis_finished ();
+	void language_changed ();
+	void language_is_additional_changed ();
 
 	void setup_sensitivity ();
 	void setup_visibility ();
@@ -100,9 +104,13 @@ private:
 	FontsDialog* _fonts_dialog;
 	wxButton* _appearance_dialog_button;
 	TextType _original_type;
+	wxStaticText* _language_label = nullptr;
+	LanguageTagWidget* _language = nullptr;
+	wxSizer* _language_sizer = nullptr;
+	wxChoice* _language_type = nullptr;
 
 	int _outline_subtitles_row;
-	int _ccap_track_row;
+	int _ccap_track_or_language_row;
 
 	std::weak_ptr<Content> _analysis_content;
 	boost::signals2::scoped_connection _analysis_finished_connection;