Make more changes to the mintages

2 files changed, 90 insertions, 11 deletions

diff --git a/data/mintages/ad b/data/mintages/ad
index ca348ce..7055b9b 100644
--- a/data/mintages/ad
+++ b/data/mintages/ad
@@ -53,5 +53,59 @@
 	            ?             ?             ?             ?             ?             ?             ?             ?
 	            ?             ?             ?             ?             ?             ?             ?             ?
 
-2014 "Council of Europe"
+2014 "20 Years in the Council of Europe"
+	            ?             ?             ?
+
+2015 "30 Years of Political Rights"
+	            ?             ?             ?
+
+2015 "25th Anniversary of the Customs Agreement"
+	            ?             ?             ?
+
+2016 "25th Anniversary of the Radio and Television of Andorra"
+	            ?             ?             ?
+
+2016 "150th Anniversary of the New Reform of 1866"
+	            ?             ?             ?
+
+2017 "100th Anniversary of the National Anthem of Andorra"
+	            ?             ?             ?
+
+2017 "The Pyrenean Country"
+	            ?             ?             ?
+
+2018 "70th Anniversary of the Universal Declaration of Human Rights"
+	            ?             ?             ?
+
+2018 "25th Anniversary of the Andorran Constitution"
+	            ?             ?             ?
+
+2019 "600th Anniversary of the Council of the Land"
+	            ?             ?             ?
+
+2019 "2019 Alpine Ski World Cup Finals"
+	            ?             ?             ?
+
+2020 "50 Years of Universal Female Suffrage"
+	            ?             ?             ?
+
+2020 "The 27th Ibero-American Summit"
+	            ?             ?             ?
+
+2021 "Taking Care of Our Seniors"
+	            ?             ?             ?
+
+2021 "Our Lady of Meritxell"
+	            ?             ?             ?
+
+2022 "The Legend of Charlemagne"
+	            ?             ?             ?
+
+2022 "10th Anniversary of the Monetary Agreement with the EU"
+	            ?             ?             ?
+
+2023 "Summer Solstice Fire Festivals in the Pyrenees"
+	            ?             ?             ?
+
+2023 "30 Years of United Nations Membership"
 	            ?             ?             ?
diff --git a/template/coins_mintages.templ b/template/coins_mintages.templ
index 3446644..894cb75 100644
--- a/template/coins_mintages.templ
+++ b/template/coins_mintages.templ
@@ -100,16 +100,41 @@ templ CoinsMintages() {
 					</tbody>
 				</table>
 			</figure>
-			<figure>
-				<figcaption>{ p.T("Commemorative Coins") }</figcaption>
-				<table class="mintage-table" role="grid">
-					<thead>
-						<th>{ p.T("Year") }</th>
-						<th>{ p.T("Commemorated Issue") }</th>
-						<th>{ p.T("Mintage") }</th>
-					</thead>
-				</table>
-			</figure>
+			if len(data.Commemorative) != 0 {
+				<figure>
+					<figcaption>{ p.T("Commemorative Coins") }</figcaption>
+					<table class="mintage-table-cc" role="grid">
+						<thead>
+							<th>{ p.T("Year") }</th>
+							<th>{ p.T("Commemorated Issue") }</th>
+							<th>{ p.T("Mintage") }</th>
+						</thead>
+						<tbody>
+							for _, row := range data.Commemorative {
+								<tr>
+									<th scope="col">
+										if len(row.Mintmark) != 0 {
+											{ strconv.Itoa(row.Year) }&nbsp;<sub><small>{ row.Mintmark }</small></sub>
+										} else {
+											{ strconv.Itoa(row.Year) }
+										}
+									</th>
+									<!-- TODO: Translate commemorative names! -->
+									<td>{ row.Name }</td>
+									switch row.Mintage[strToCtype(ctype)] {
+										case mintage.Unknown:
+											<td>{ p.T("Unknown") }</td>
+										case 0:
+											<td>—</td>
+										default:
+											<td>{ p.N(row.Mintage[strToCtype(ctype)]) }</td>
+									}
+								</tr>
+							}
+						</tbody>
+					</table>
+				</figure>
+			}
 		</section>
 	</main>
 }