From 386eeb59db60aea5431bcfbe1b29d0dd3a59d497 Mon Sep 17 00:00:00 2001
From: Rob Amos <bok-@users.noreply.github.com>
Date: Mon, 13 Jul 2020 15:48:01 +1000
Subject: [PATCH] Fixed case where numbers in Vexillographer calculated
 property display names were not treated as separate words

---
 .../Vexillographer/Unfurling/FlagContainer+Extensions.swift   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Sources/Vexillographer/Unfurling/FlagContainer+Extensions.swift b/Sources/Vexillographer/Unfurling/FlagContainer+Extensions.swift
index 59916978..f5f92b04 100644
--- a/Sources/Vexillographer/Unfurling/FlagContainer+Extensions.swift
+++ b/Sources/Vexillographer/Unfurling/FlagContainer+Extensions.swift
@@ -68,8 +68,10 @@ extension String {
         var wordStart = string.startIndex
         var searchRange = string.index(after: wordStart)..<string.endIndex
 
+        let uppercase = CharacterSet.uppercaseLetters.union(CharacterSet.decimalDigits)
+
         // Find next uppercase character
-        while let upperCaseRange = string.rangeOfCharacter(from: CharacterSet.uppercaseLetters, options: [], range: searchRange) {
+        while let upperCaseRange = string.rangeOfCharacter(from: uppercase, options: [], range: searchRange) {
             let untilUpperCase = wordStart..<upperCaseRange.lowerBound
             words.append(untilUpperCase)