From 422031770c3a60e47e72dbe9d143c8ac0c9275f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20D=C3=B6bertin?= <hello@jd-powered.net>
Date: Tue, 17 Nov 2015 10:50:46 +0100
Subject: [PATCH 1/2] More compatible way of getting the current panel language

---
 selector.php | 14 +++++++++++---
 template.php |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/selector.php b/selector.php
index babb272..9dad0b5 100644
--- a/selector.php
+++ b/selector.php
@@ -2,7 +2,7 @@
 
 /**
  * Selector.
- * 
+ *
  * Fileselect Field for Kirby 2
  *
  * @version   1.5.0
@@ -143,9 +143,17 @@ class SelectorField extends BaseField
      */
     public function __construct()
     {
-        // Load language files
+        // Build translation file path
         $baseDir = __DIR__ . DS . self::LANG_DIR . DS;
-        $lang    = panel()->language();
+
+        // Get panel language
+        if (version_compare(panel()->version(), '2.2', '>=')) {
+            $lang = panel()->translation()->code();
+        } else {
+            $lang = panel()->language();
+        }
+
+        // Load language files
         if (file_exists($baseDir . $lang . '.php')) {
             require $baseDir . $lang . '.php';
         } else {
diff --git a/template.php b/template.php
index 35d60d4..9369159 100644
--- a/template.php
+++ b/template.php
@@ -8,7 +8,7 @@
                 <div class="item-content">
                     <?php if ($file->type() == 'image'): ?>
                         <figure class="item-image">
-                            <?php if (version_compare(Kirby::version(), '2.2', '>=')): ?>
+                            <?php if (version_compare(panel()->version(), '2.2', '>=')): ?>
                                 <a class="btn btn-with-icon" data-context="<?= purl($file, 'context') ?>" href="#options" title="<?= l('pages.show.subpages.edit') ?>">
                                     <?= thumb($file, array('width' => 48, 'height' => 48, 'crop' => true)) ?>
                                 </a>
@@ -43,7 +43,7 @@
                 <nav class="item-options">
                     <ul class="nav nav-bar">
                         <li>
-                            <?php if (version_compare(Kirby::version(), '2.2', '>=')): ?>
+                            <?php if (version_compare(panel()->version(), '2.2', '>=')): ?>
                                 <a class="btn btn-with-icon" data-context="<?= purl($file, 'context') ?>" href="#options" title="<?= l('pages.show.subpages.edit') ?>">
                                     <i class="icon icon-left fa fa-pencil"></i>
                                     <span><?= l('pages.show.subpages.edit') ?></span>

From 9ab41d34adda0c16b4e3285bde1523b1865199fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20D=C3=B6bertin?= <hello@jd-powered.net>
Date: Tue, 17 Nov 2015 10:55:55 +0100
Subject: [PATCH 2/2] Bump to version 1.5.1

---
 CHANGELOG.md | 6 ++++++
 selector.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa6f82e..e367ecd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Version 1.5.1
+
+**Bugfixes:**
+
+* More compatible way of getting the current panel language
+
 ## Version 1.5.0
 
 **Features:**
diff --git a/selector.php b/selector.php
index 9dad0b5..4341c9f 100644
--- a/selector.php
+++ b/selector.php
@@ -5,7 +5,7 @@
  *
  * Fileselect Field for Kirby 2
  *
- * @version   1.5.0
+ * @version   1.5.1
  * @author    digital storytelling pioneers <digital@storypioneers.com>
  * @author    feat. Jonas Döbertin <hello@jd-powered.net>
  * @copyright digital storytelling pioneers <digital@storypioneers.com>