Merge remote-tracking branch 'upstream/master'

Conflicts:
	doc/html/classRedmatrix_1_1Import_1_1Import-members.html
	doc/html/classRedmatrix_1_1Import_1_1Import.js

1 files changed, 37 insertions, 0 deletions

diff --git a/library/intl/src/Language/LanguageInterface.php b/library/intl/src/Language/LanguageInterface.php
new file mode 100644
index 000000000..612389142
--- /dev/null
+++ b/library/intl/src/Language/LanguageInterface.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace CommerceGuys\Intl\Language;
+
+interface LanguageInterface
+{
+    /**
+     * Gets the two-letter language code.
+     *
+     * @return string
+     */
+    public function getLanguageCode();
+
+    /**
+     * Sets the two-letter language code.
+     *
+     * @param string $languageCode The two-letter language code.
+     */
+    public function setLanguageCode($languageCode);
+
+    /**
+     * Gets the language name.
+     *
+     * Note that certain locales have incomplete translations, in which
+     * case the english version of the language name is used instead.
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Sets the language name.
+     *
+     * @param string $name The language name.
+     */
+    public function setName($name);
+}