HTML Help language codes were moved to localization files.

diff --git a/xsl/htmlhelp/htmlhelp-common.xsl b/xsl/htmlhelp/htmlhelp-common.xsl
index 8fbbe7d269e3ac9729810e517c24cba09830cbc7..a6f861f9022c72e9f28cac92f1924af6d48ed4cf 100644 (file)
--- a/xsl/htmlhelp/htmlhelp-common.xsl
+++ b/xsl/htmlhelp/htmlhelp-common.xsl
@@ -146,13 +146,12 @@ Full-text search=Yes
 <xsl:text>Index file=</xsl:text><xsl:value-of select="$htmlhelp.hhk"/><xsl:text>
 </xsl:text></xsl:if>
 <xsl:text>Language=</xsl:text>
-<xsl:if test="//@lang">
-  <xsl:variable name="lang" select="//@lang[1]"/>
-  <xsl:value-of select="document('langcodes.xml')//gentext[@lang=string($lang)]"/>
-</xsl:if>
-<xsl:if test="not(//@lang)">
-  <xsl:text>0x0409 English (United States)</xsl:text>
-</xsl:if>
+<xsl:for-each select="*">   <!-- Change context from / to root element -->
+  <xsl:call-template name="gentext.template">
+    <xsl:with-param name="context" select="'htmlhelp'"/>
+    <xsl:with-param name="name" select="'langcode'"/>
+  </xsl:call-template>
+</xsl:for-each>
 <xsl:text>
 Title=</xsl:text>
   <xsl:choose>

diff --git a/xsl/htmlhelp/langcodes.xml b/xsl/htmlhelp/langcodes.xml
deleted file mode 100644 (file)
index 0e1847c..0000000
--- a/xsl/htmlhelp/langcodes.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<localization>
-<gentext lang="sq">0x041c Albanian</gentext>
-<gentext lang="ar">0x1401 Arabic (ALGERIA)</gentext>
-<gentext lang="es">0x2c0a Spanish (ARGENTINA)</gentext>
-<gentext lang="en">0x0c09 English (AUSTRALIA)</gentext>
-<gentext lang="de">0x0c07 German (AUSTRIA)</gentext>
-<gentext lang="ar">0x3c01 Arabic (BAHRAIN)</gentext>
-<gentext lang="be">0x0423 Byelorussian</gentext>
-<gentext lang="fr">0x080c French (BELGIUM)</gentext>
-<gentext lang="en">0x2809 English (BELIZE)</gentext>
-<gentext lang="es">0x400a Spanish (BOLIVIA)</gentext>
-<gentext lang="pt">0x0416 Portuguese (BRAZIL)</gentext>
-<gentext lang="ms">0x083e Malay (BRUNEI DARUSSALAM)</gentext>
-<gentext lang="bg">0x0402 Bulgarian</gentext>
-<gentext lang="fr">0x0c0c French (CANADA)</gentext>
-<gentext lang="es">0x340a Spanish (CHILE)</gentext>
-<gentext lang="zh">0x0804 Chinese (CHINA)</gentext>
-<gentext lang="es">0x240a Spanish (COLOMBIA)</gentext>
-<gentext lang="es">0x140a Spanish (COSTA RICA)</gentext>
-<gentext lang="hr">0x041a Croatian</gentext>
-<gentext lang="cs">0x0405 Czech</gentext>
-<gentext lang="da">0x0406 Danish</gentext>
-<gentext lang="es">0x1c0a Spanish (DOMINICAN REPUBLIC)</gentext>
-<gentext lang="es">0x300a Spanish (ECUADOR)</gentext>
-<gentext lang="ar">0x0c01 Arabic (EGYPT)</gentext>
-<gentext lang="es">0x440a Spanish (EL SALVADOR)</gentext>
-<gentext lang="et">0x0425 Estonian</gentext>
-<gentext lang="fo">0x0438 Faeroese</gentext>
-<gentext lang="fi">0x040b Finnish</gentext>
-<gentext lang="fr">0x040c French (FRANCE)</gentext>
-<gentext lang="de">0x0407 German (GERMANY)</gentext>
-<gentext lang="el">0x0408 Greek</gentext>
-<gentext lang="es">0x100a Spanish (GUATEMALA)</gentext>
-<gentext lang="es">0x480a Spanish (HONDURAS)</gentext>
-<gentext lang="zh">0x0c04 Chinese (HONG KONG)</gentext>
-<gentext lang="hu">0x040e Hungarian</gentext>
-<gentext lang="is">0x040f Icelandic</gentext>
-<gentext lang="hi">0x0439 Hindi</gentext>
-<gentext lang="in">0x04</gentext>
-<gentext lang="fa">0x0429 Farsi</gentext>
-<gentext lang="ar">0x0801 Arabic (IRAQ)</gentext>
-<gentext lang="en">0x1809 English (IRELAND)</gentext>
-<gentext lang="iw">0x04</gentext>
-<gentext lang="it">0x0410 Italian</gentext>
-<gentext lang="en">0x2009 English (JAMAICA)</gentext>
-<gentext lang="ja">0x0411 Japanese</gentext>
-<gentext lang="ar">0x2c01 Arabic (JORDAN)</gentext>
-<gentext lang="sw">0x0441 Swahili</gentext>
-<gentext lang="ko">0x0412 Korean</gentext>
-<gentext lang="ar">0x3401 Arabic (KUWAIT)</gentext>
-<gentext lang="lv">0x0426 Latvian (Lettish)</gentext>
-<gentext lang="ar">0x3001 Arabic (LEBANON)</gentext>
-<gentext lang="ar">0x1001 Arabic (LIBYAN ARAB JAMAHIRIYA)</gentext>
-<gentext lang="de">0x1407 German (LIECHTENSTEIN)</gentext>
-<gentext lang="lt">0x0427 Lithuanian</gentext>
-<gentext lang="de">0x1007 German (LUXEMBOURG)</gentext>
-<gentext lang="zh">0x1404 Chinese (MACAU)</gentext>
-<gentext lang="mk">0x042f Macedonian</gentext>
-<gentext lang="ms">0x043e Malay (MALAYSIA)</gentext>
-<gentext lang="es">0x080a Spanish (MEXICO)</gentext>
-<gentext lang="fr">0x180c French (MONACO)</gentext>
-<gentext lang="ar">0x1801 Arabic (MOROCCO)</gentext>
-<gentext lang="nl">0x0413 Dutch</gentext>
-<gentext lang="en">0x1409 English (NEW ZEALAND)</gentext>
-<gentext lang="es">0x4c0a Spanish (NICARAGUA)</gentext>
-<gentext lang="no">0x0414 Norwegian</gentext>
-<gentext lang="ar">0x2001 Arabic (OMAN)</gentext>
-<gentext lang="ur">0x0420 Urdu</gentext>
-<gentext lang="es">0x180a Spanish (PANAMA)</gentext>
-<gentext lang="es">0x3c0a Spanish (PARAGUAY)</gentext>
-<gentext lang="es">0x280a Spanish (PERU)</gentext>
-<gentext lang="en">0x3409 English (PHILIPPINES)</gentext>
-<gentext lang="pl">0x0415 Polish</gentext>
-<gentext lang="pt">0x0816 Portuguese (PORTUGAL)</gentext>
-<gentext lang="es">0x500a Spanish (PUERTO RICO)</gentext>
-<gentext lang="ar">0x4001 Arabic (QATAR)</gentext>
-<gentext lang="ro">0x0418 Romanian</gentext>
-<gentext lang="ru">0x0419 Russian</gentext>
-<gentext lang="ar">0x0401 Arabic (SAUDI ARABIA)</gentext>
-<gentext lang="zh">0x1004 Chinese (SINGAPORE)</gentext>
-<gentext lang="sk">0x041b Slovak</gentext>
-<gentext lang="sl">0x0424 Slovenian</gentext>
-<gentext lang="af">0x0436 Afrikaans</gentext>
-<gentext lang="ca">0x0403 Catalan</gentext>
-<gentext lang="sv">0x041d Swedish</gentext>
-<gentext lang="de">0x0807 German (SWITZERLAND)</gentext>
-<gentext lang="ar">0x2801 Arabic (SYRIAN ARAB REPUBLIC)</gentext>
-<gentext lang="zh">0x0404 Chinese (TAIWAN, PROVINCE OF CHINA)</gentext>
-<gentext lang="th">0x041e Thai</gentext>
-<gentext lang="en">0x2c09 English (TRINIDAD AND TOBAGO)</gentext>
-<gentext lang="ar">0x1c01 Arabic (TUNISIA)</gentext>
-<gentext lang="tr">0x041f Turkish</gentext>
-<gentext lang="uk">0x0422 Ukrainian</gentext>
-<gentext lang="ar">0x3801 Arabic (UNITED ARAB EMIRATES)</gentext>
-<gentext lang="en">0x0809 English (UNITED KINGDOM)</gentext>
-<gentext lang="en">0x0409 English (UNITED STATES)</gentext>
-<gentext lang="es">0x380a Spanish (URUGUAY)</gentext>
-<gentext lang="es">0x200a Spanish (VENEZUELA)</gentext>
-<gentext lang="vi">0x242a Vietnamese</gentext>
-<gentext lang="ar">0x2401 Arabic (YEMEN)</gentext>
-<gentext lang="en">0x3009 English (ZIMBABWE)</gentext>
-</localization>