Skip to content

Commit

Permalink
Merge pull request #8 from oat-sa/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
llecaque committed Jun 19, 2015
2 parents 9e8101d + a3efc3b commit ff3ef1e
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 30 deletions.
1 change: 1 addition & 0 deletions locales/en-US/messages.lang.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
$GLOBALS['__l10n']["Manage test takers"]="Manage test-takers";
$GLOBALS['__l10n']["Record and manage test takers."]="Record and manage test-takers.";
$GLOBALS['__l10n']["Test takers library"]="Test-takers library";

?>
25 changes: 3 additions & 22 deletions locales/en-US/messages.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: TAO 3.0-RC04\n"
"PO-Revision-Date: 2015-03-06T16:00:18\n"
"Project-Id-Version: TAO v3.1-dev\n"
"PO-Revision-Date: 2015-06-18T18:16:11\n"
"Last-Translator: TAO Translation Team <translation@tao.lu>\n"
"MIME-Version: 1.0\n"
"Language: en-US\n"
Expand All @@ -13,16 +13,6 @@ msgstr ""
"X-Poedit-KeywordsList: __\n"
"X-Poedit-SearchPath-0: .\n"

msgid "%1s has been applied to %2s items', basename($destPath), $count) : __('CSS was not applied to any items"
msgstr ""

msgid "Apply CSS to Items"
msgstr ""

#, tao-public
msgid "Base-64 Converter"
msgstr ""

msgid "Base64 Converter"
msgstr ""

Expand All @@ -33,19 +23,10 @@ msgid "Convert to Base64 Code"
msgstr ""

#, tao-public
msgid "CSS Dev Kit"
msgstr ""

msgid "CSS Development Kit"
msgstr ""

msgid "Download CSS Development Kit"
msgid "Data URI"
msgstr ""

#, tao-public
msgid "Tools"
msgstr ""

msgid "Upload and apply the finished CSS file"
msgstr ""

2 changes: 1 addition & 1 deletion locales/en-US/messages_po.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions manifest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
'label' => 'DataURI Tool',
'description' => '',
'license' => 'GPL-2.0',
'version' => '0.0.0',
'version' => '0.0.2',
'author' => 'Open Assessment Technologies SA',
'requires' => array(),
// for compatibility
Expand All @@ -35,11 +35,7 @@
),
'uninstall' => array(
),
'autoload' => array (
'psr-4' => array(
'oat\\taoDataUri\\' => dirname(__FILE__).DIRECTORY_SEPARATOR
)
),
'update' => 'oat\\taoDataUri\\scripts\\update\\Updater',
'routes' => array(
'/taoDataUri' => 'oat\\taoDataUri\\controller'
),
Expand Down
43 changes: 43 additions & 0 deletions scripts/update/Updater.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php
/**
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; under version 2
* of the License (non-upgradable).
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Copyright (c) 2014 (original work) Open Assessment Technologies SA;
*
*
*/
namespace oat\taoDataUri\scripts\update;

/**
*
* @author Joel Bout <joel@taotesting.com>
*/
class Updater extends \common_ext_ExtensionUpdater {

/**
*
* @param string $currentVersion
* @return string $versionUpdatedTo
*/
public function update($initialVersion) {

$currentVersion = $initialVersion;

if ($currentVersion == '0.0.0') {
$currentVersion = '0.0.2';
}
return $currentVersion;
}
}
2 changes: 1 addition & 1 deletion views/js/controllers.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ff3ef1e

Please sign in to comment.