diff --git a/samples/browser/web/index.html b/samples/browser/web/index.html
index 5a8224b..fb2af2d 100644
--- a/samples/browser/web/index.html
+++ b/samples/browser/web/index.html
@@ -40,7 +40,7 @@
 <footer id="pageFooter" class="dark-mode">
     <div>Sample for pub-package:
         <a href="https://pub.dartlang.org/packages/l10n" target="_blank">l10n</a>
-        <span class="published">/ published: <span class="pubdate">2018-09-15 / 09:10:07</span></span>
+        <span class="published">/ published: <span class="pubdate">2018-09-15 / 10:17:40</span></span>
     </div>
 
     <div>
diff --git a/samples/browser/web/main.dart b/samples/browser/web/main.dart
index 5009530..ce4ee0b 100644
--- a/samples/browser/web/main.dart
+++ b/samples/browser/web/main.dart
@@ -9,6 +9,25 @@ import 'package:l10n/l10n.dart';
 import 'package:browser_example/_l10n/messages_all.dart';
 
 Future main() async {
+    final String locale = await _initLanguageSettings();
+
+    (dom.querySelector("head") as dom.HeadElement).lang = locale;
+
+    dom.querySelectorAll('.translate')
+        .map((final dom.Element element) => element as dom.HtmlElement)
+        .forEach((final dom.HtmlElement element) {
+            element.text = element.text.replaceAllMapped(RegExp(r'_\("(.*)"\)', multiLine: true),
+                    (final Match match) {
+                    return l10n(match.group(1));
+                });
+    });
+
+    dom.querySelector("body").classes.remove("loading");
+}
+
+/// Initialize the Intl-Framework
+/// 
+Future<String> _initLanguageSettings() async {
     // Determine your locale
     final String locale = await findSystemLocale();
     final String shortLocale = Intl.shortLocale(Uri.base.queryParameters['lang'] ?? locale);
@@ -24,16 +43,5 @@ Future main() async {
     // Initialize translation-table
     await initializeMessages(shortLocale);
 
-    (dom.querySelector("head") as dom.HeadElement).lang = shortLocale;
-
-    dom.querySelectorAll('.translate')
-        .map((final dom.Element element) => element as dom.HtmlElement)
-        .forEach((final dom.HtmlElement element) {
-            element.text = element.text.replaceAllMapped(RegExp(r'_\("(.*)"\)', multiLine: true),
-                    (final Match match) {
-                    return l10n(match.group(1));
-                });
-    });
-
-    dom.querySelector("body").classes.remove("loading");
-}
+    return shortLocale;
+}
\ No newline at end of file