Merge pull request #3 from phillipsdata/remove-language

Removed Language dependency.
phillipsdata · Dec 11, 2015 · 0e4a7be · 0e4a7be
2 parents 385a946 + c0d907d
commit 0e4a7be
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# minphp/Pagination
+# Minphp/Pagination
 
 [![Build Status](https://travis-ci.org/phillipsdata/minphp-pagination.svg?branch=master)](https://travis-ci.org/phillipsdata/minphp-pagination)
 
@@ -9,7 +9,7 @@ Pagination Helper.
 Install via composer:
 
 ```sh
-composer require minphp/pagination:dev-master
+composer require minphp/pagination
 ```
 
 ## Basic Usage

diff --git a/composer.json b/composer.json
@@ -12,8 +12,7 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "minphp/html": "dev-master",
-        "minphp/language": "dev-master"
+        "minphp/html": "~1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",

diff --git a/src/Language/en_us/pagination.php b/src/Language/en_us/pagination.php
diff --git a/src/Pagination.php b/src/Pagination.php
@@ -2,7 +2,6 @@
 namespace Minphp\Pagination;
 
 use Minphp\Html\Html;
-use Minphp\Language\Language;
 
 /**
  * Provides helper methods for dealing with Page Navigation content.
@@ -43,13 +42,6 @@ class Pagination extends Html
      */
     public function __construct(array $get = array(), array $format = array())
     {
-        // Load the language for the pagination
-        Language::loadLang(
-            "pagination",
-            null,
-            dirname(__FILE__) . DIRECTORY_SEPARATOR . "language" . DIRECTORY_SEPARATOR
-        );
-
         $this->setGet($get);
 
         $this->settings = array(
@@ -62,7 +54,7 @@ public function __construct(array $get = array(), array $format = array())
                 // First page link
                 'first' => array(
                     'tag' => "li",
-                    'name' => Language::_("Pagination.first_link", true),
+                    'name' => "← First",
                     'attributes' => array(),
                     'link_attributes' => array(),
                     'show' => "if_needed", // options: if_needed, never, always
@@ -71,7 +63,7 @@ public function __construct(array $get = array(), array $format = array())
                 // Last page link
                 'last' => array(
                     'tag' => "li",
-                    'name' => Language::_("Pagination.last_link", true),
+                    'name' => "Last →",
                     'attributes' => array(),
                     'link_attributes' => array(),
                     'show' => "if_needed", // options: if_needed, never, always
@@ -80,7 +72,7 @@ public function __construct(array $get = array(), array $format = array())
                 // Next page link
                 'next' => array(
                     'tag' => "li",
-                    'name' => Language::_("Pagination.next_link", true),
+                    'name' => "Next",
                     'attributes' => array(),
                     'link_attributes' => array(),
                     'show' => "if_needed", // options: if_needed, never, always
@@ -89,7 +81,7 @@ public function __construct(array $get = array(), array $format = array())
                 // Previous page link
                 'prev' => array(
                     'tag' => "li",
-                    'name' => Language::_("Pagination.prev_link", true),
+                    'name' => "Prev",
                     'attributes' => array(),
                     'link_attributes' => array(),
                     'show' => "if_needed", // options: if_needed, never, always