Skip to content

Commit

Permalink
Merge branch 'release/2.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ercanozkaya committed Apr 10, 2015
2 parents b401825 + af0eba7 commit 0524028
Show file tree
Hide file tree
Showing 145 changed files with 1,161 additions and 724 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Requirements
Installation
------------

Go to the root directory of your Joomla installation in command line and execute this command:
Go to the root directory of your Joomla installation in command line and execute this command:

```
composer require nooku/nooku-framework:2.*
Expand Down
2 changes: 1 addition & 1 deletion code/administrator/manifests/files/files_koowa.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<license>GNU GPLv3 - http://www.gnu.org/licenses/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomlatools.com</authorUrl>
<version>2.0.6</version>
<version>2.1.0</version>
<description></description>

<scriptfile>script.php</scriptfile>
Expand Down
10 changes: 0 additions & 10 deletions code/libraries/koowa/components/com_koowa/class/locator/module.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,4 @@ public function locate($class, $basepath = null)

return false;
}

/**
* Get locator name
*
* @return string
*/
public static function getName()
{
return self::$_name;
}
}
10 changes: 0 additions & 10 deletions code/libraries/koowa/components/com_koowa/class/locator/plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,4 @@ public function locate($classname, $basepath = null)
return false;

}

/**
* Get locator name
*
* @return string
*/
public static function getName()
{
return self::$_name;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?php
/**
* Nooku Framework - http://nooku.org/framework
*
* @copyright Copyright (C) 2007 - 2014 Johan Janssens and Timble CVBA. (http://www.timble.net)
* @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
* @link https://github.com/nooku/nooku-framework for the canonical source repository
*/

/**
* Error Controller Permission
*
* @author Johan Janssens <http://github.com/johanjanssens>
* @package Koowa\Wordpress\Library\Controller
*/
class ComKoowaControllerPermissionUser extends KControllerPermissionAbstract
{
public function canAdd()
{
return false;
}

public function canEdit()
{
return false;
}

public function canDelete()
{
return false;
}

public function canAdmin()
{
return false;
}

public function canManage()
{
return false;
}
}
54 changes: 54 additions & 0 deletions code/libraries/koowa/components/com_koowa/model/entity/user.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?php
/**
* Nooku Framework - http://nooku.org/framework
*
* @copyright Copyright (C) 2007 - 2014 Johan Janssens and Timble CVBA. (http://www.timble.net)
* @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
* @link https://github.com/nooku/nooku-framework for the canonical source repository
*/

/**
* User entity
*
* @package Koowa\Component\Koowa\Model
*/
class ComKoowaModelEntityUser extends KModelEntityRow
{
/**
* A whitelist of fields visible in the JSON representation
*
* @var array
*/
protected $_fields = array();

public function __construct(KObjectConfig $config)
{
parent::__construct($config);

// Only allow fields in the config option for security reasons
$this->_fields = array_fill_keys(KObjectConfig::unbox($config->fields), null);
}

protected function _initialize(KObjectConfig $config)
{
if (empty($config->fields)) {
$config->fields = array('id', 'name');
}

parent::_initialize($config);
}

/**
* Excludes private fields from JSON representation
*
* @return array
*/
public function toArray()
{
$data = parent::toArray();

$data = array_intersect_key($data, $this->_fields);

return $data;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,4 @@ public function locate(KObjectIdentifier $identifier, $fallback = true)

return $this->find($info, $fallback);
}

/**
* Get the name
*
* @return string
*/
public static function getName()
{
return self::$_name;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,4 @@ protected function _initialize(KObjectConfig $config)

parent::_initialize($config);
}

/**
* Get the name
*
* @return string
*/
public static function getName()
{
return self::$_name;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
; Copyright © 2014 Timble CVBA. (http://www.timble.net)
; GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
; Note : All ini files need to be saved as UTF-8

;libraries/koowa/components/com_koowa/controller/toolbar/actionbar.php
KLS_EDIT_ITEM_TYPE="עריכת {item_type}"
KLS_CREATE_NEW_ITEM_TYPE="יצירת {item_type} חדש"

;libraries/koowa/components/com_koowa/event/subscriber/unauthorized.php
KLS_YOU_ARE_NOT_AUTHORIZED_TO_ACCESS_THIS_RE_57A91="אינך רשאי/ת לגשת למשאב זה. יש להתחבר ולנסות שנית."

;libraries/koowa/components/com_koowa/template/helper/accordion.php
KLS_SLIDE="גלילה"

;libraries/koowa/components/com_koowa/template/helper/behavior.php
KLS_CLEAR="ניקוי"

;libraries/koowa/components/com_koowa/template/helper/grid.php
KLS_MOVE_UP="הזזה למעלה"
KLS_MOVE_DOWN="הזזה למטה"
KLS_PLEASE_ORDER_BY_THIS_COLUMN_FIRST_BY_CLI_6340E="נא לסדר את הטבלה לפי עמודה זה על-ידי לחיצה על כותרת העמודה"

;libraries/koowa/components/com_koowa/template/helper/listbox.php
KLS_SELECT="בחירה"

;libraries/koowa/components/com_koowa/user/provider.php
KLS_ANONYMOUS="אנונימי"

;libraries/koowa/libraries/controller/behavior/editable.php
KLS_LOCKED_BY_NAME_DATE="נעול על-ידי {name} {date}"

;libraries/koowa/libraries/controller/toolbar/actionbar.php
KLS_DELETED_ITEMS_WILL_BE_LOST_FOREVER_WOUL_77DC3="פריטים מחוקים יאבדו לנצח. האם תרצה/י להמשיך?"

;libraries/koowa/libraries/date/date.php
KLS_YESTERDAY="אתמול"
KLS_TOMORROW="מחר"
KLS_JUST_NOW="זה הרגע"

;libraries/koowa/libraries/template/helper/actionbar.php
KLS_YOU_ARE_NOT_ALLOWED_TO_PERFORM_THIS_ACTI_90D0A="אינך רשאי/ת לבצע פעולה זה"

;libraries/koowa/libraries/template/helper/behavior.php
KLS_LOADING="טוען..."

;libraries/koowa/libraries/template/helper/date.php
KLS_NEVER="מעולם"

;libraries/koowa/libraries/template/helper/grid.php
KLS_FIND_BY_TITLE_OR_DESCRIPTION="חיפוש לפי כותרת או תיאור&hellip;"
KLS_DISABLE_ITEM="ביטול פריט"
KLS_ENABLE_ITEM="אפשור פריט"
KLS_UNPUBLISH_ITEM="ביטול פרסום פריט"
KLS_PUBLISH_ITEM="פרסום פריט"

;libraries/koowa/libraries/template/helper/paginator.php
KLS_PAGE_X_OF_X="דף %s מתוך %s"

KLS_NUMBER_SECOND_AGO="לפני 1 שנייה"
KLS_NUMBER_SECONDS_AGO="לפני {number} שניות"
KLS_NUMBER_MINUTE_AGO="לפני 1 דקה"
KLS_NUMBER_MINUTES_AGO="לפני {number} דקות"
KLS_NUMBER_HOUR_AGO="לפני 1 שעה"
KLS_NUMBER_HOURS_AGO="לפני {number} שעות"
KLS_NUMBER_DAY_AGO="לפני 1 יום"
KLS_NUMBER_DAYS_AGO="לפני {number} ימים"
KLS_NUMBER_WEEK_AGO="לפני 1 שבוע"
KLS_NUMBER_WEEKS_AGO="לפני {number} שבועות"
KLS_NUMBER_MONTH_AGO="לפני 1 חודש"
KLS_NUMBER_MONTHS_AGO="לפני {number} חודשים"
KLS_NUMBER_YEAR_AGO="לפני 1 שנה"
KLS_NUMBER_YEARS_AGO="לפני {number} שנים"
KLS_NUMBER_SECOND_FROM_NOW="עוד 1 שנייה מעכשיו"
KLS_NUMBER_SECONDS_FROM_NOW="עוד {number} שניות מעכשיו"
KLS_NUMBER_MINUTE_FROM_NOW="עוד 1 דקה מעכשיו"
KLS_NUMBER_MINUTES_FROM_NOW="עוד {number} דקות מעכשיו"
KLS_NUMBER_HOUR_FROM_NOW="עוד 1 שעה מעכשיו"
KLS_NUMBER_HOURS_FROM_NOW="עוד {number} מעכשיו"
KLS_NUMBER_DAY_FROM_NOW="עוד 1 יום מעכשיו"
KLS_NUMBER_DAYS_FROM_NOW="עוד {number} ימים מעכשיו"
KLS_NUMBER_WEEK_FROM_NOW="עוד 1 שבוע מעכשיו"
KLS_NUMBER_WEEKS_FROM_NOW="עוד {number} שבועות מעכשיו"
KLS_NUMBER_MONTH_FROM_NOW="עוד 1 חודש מעכשיו"
KLS_NUMBER_MONTHS_FROM_NOW="עוד {number} חודשים מעכשיו"
KLS_NUMBER_YEAR_FROM_NOW="עוד 1 שנה מעכשיו"
KLS_NUMBER_YEARS_FROM_NOW="עוד {number} שנים מעכשיו"
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ KLS_NUMBER_SECONDS_AGO="{number} seconden geleden"
KLS_NUMBER_MINUTE_AGO="1 minuut geleden"
KLS_NUMBER_MINUTES_AGO="{number} minuten geleden"
KLS_NUMBER_HOUR_AGO="1 uur geleden"
KLS_NUMBER_HOURS_AGO="number} uren geleden"
KLS_NUMBER_HOURS_AGO="{number} uren geleden"
KLS_NUMBER_DAY_AGO="1 dag geleden"
KLS_NUMBER_DAYS_AGO="{number} dagen geleden"
KLS_NUMBER_WEEK_AGO="1 week geleden"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,13 +210,6 @@ public function calendar($config = array())
$config->value = '';
}

// @TODO this is legacy, or bc support, and may not be compatible with strftime and the like
$config->format = str_replace(
array('%Y', '%y', '%m', '%d', '%H', '%M', '%S'),
array('yyyy', 'yy', 'mm', 'dd', 'hh', 'ii', 'ss'),
$config->format
);

switch (strtoupper($config->filter))
{
case 'SERVER_UTC':
Expand Down Expand Up @@ -279,9 +272,20 @@ public function calendar($config = array())
self::$_loaded['calendar-triggers'] = array();
}

if ($config->value) {
$config->value = strftime($config->format, JFactory::getDate($config->value)->format('U', false, true));
}

$attribs = $this->buildAttributes($config->attribs);
$value = $this->getTemplate()->escape($config->value);

// @TODO this is legacy, or bc support, and may not be compatible with strftime and the like
$config->format = str_replace(
array('%Y', '%y', '%m', '%d', '%H', '%M', '%S'),
array('yyyy', 'yy', 'mm', 'dd', 'hh', 'ii', 'ss'),
$config->format
);

if ($config->attribs->readonly !== 'readonly' && $config->attribs->disabled !== 'disabled')
{
// Only display the triggers once for each control.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,6 @@ protected function _initialize(KObjectConfig $config)
parent::_initialize($config);
}

/**
* Get the locator name
*
* @return string The stream name
*/
public static function getName()
{
return self::$_name;
}

/**
* Find a template path
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,4 @@ public function find(array $info)

return array('com_' . $package => $path);
}

/**
* Get the locator name
*
* @return string The stream name
*/
public static function getName()
{
return self::$_name;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,4 @@ public function find(array $info)

return array('mod_'.$package => $basepath);
}

/**
* Get the locator name
*
* @return string The stream name
*/
public static function getName()
{
return self::$_name;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,4 @@ public function find(array $info)

return array('plg_'.$package.'_'.$name => $basepath);
}

/**
* Get the locator name
*
* @return string The stream name
*/
public static function getName()
{
return self::$_name;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class ComKoowaViewPageHtml extends ComKoowaViewHtml
protected function _initialize(KObjectConfig $config)
{
$config->append(array(
'layout' => 'joomla',
'template_filters' => array('document', 'module', 'style', 'link', 'meta', 'script', 'title', 'message'),
));

Expand Down
Loading

0 comments on commit 0524028

Please sign in to comment.