From 201f43719b21e22898b7fbe339a7cf93294aac8d Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Mon, 11 Jan 2016 08:49:36 +0100
Subject: [PATCH] Use new language pack helper

Refs flarum/core#717.
---
 extensions/lang-english/bootstrap.php | 33 +--------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/extensions/lang-english/bootstrap.php b/extensions/lang-english/bootstrap.php
index 5fdb1a099..23ae20fcf 100644
--- a/extensions/lang-english/bootstrap.php
+++ b/extensions/lang-english/bootstrap.php
@@ -5,37 +5,6 @@ use Flarum\Event\ConfigureLocales;
 
 return function (Dispatcher $events) {
     $events->listen(ConfigureLocales::class, function(ConfigureLocales $event) {
-        $name = $title = basename(__DIR__);
-
-        if (file_exists($manifest = __DIR__.'/composer.json')) {
-            $json = json_decode(file_get_contents($manifest), true);
-
-            if (empty($json)) {
-                throw new RuntimeException("Error parsing composer.json in $name: ".json_last_error_msg());
-            }
-
-            $locale = array_get($json, 'extra.flarum-locale.code');
-            $title = array_get($json, 'extra.flarum-locale.title', $title);
-        }
-
-        if (! isset($locale)) {
-            throw new RuntimeException("Language pack $name must define \"extra.flarum-locale.code\" in composer.json.");
-        }
-
-        $event->locales->addLocale($locale, $title);
-
-        if (! is_dir($localeDir = __DIR__.'/locale')) {
-            throw new RuntimeException("Language pack $name must have a \"locale\" subdirectory.");
-        }
-
-        if (file_exists($file = $localeDir.'/config.js')) {
-            $event->locales->addJsFile($locale, $file);
-        }
-
-        foreach (new DirectoryIterator($localeDir) as $file) {
-            if ($file->isFile() && in_array($file->getExtension(), ['yml', 'yaml'])) {
-                $event->locales->addTranslations($locale, $file->getPathname());
-            }
-        }
+        $event->loadLanguagePackFrom(__DIR__);
     });
 };