[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4081-g6d15681

The branch, master has been updated via 6d1568199ac71834f57e435369b5c6b6e0eed81a (commit) via 94b9b5e70581b2c5a3f1ef1464d3c7247af8cc6d (commit) from 210f3f5a0ec87d3cf9c7b182dfeb1575e760a230 (commit) - Log ----------------------------------------------------------------- commit 6d1568199ac71834f57e435369b5c6b6e0eed81a Author: Michal Čihař &lt;mcihar(a)novell.com&gt; Date: Tue May 25 14:39:43 2010 +0200 Remove reference to language file. commit 94b9b5e70581b2c5a3f1ef1464d3c7247af8cc6d Author: Michal Čihař &lt;mcihar(a)novell.com&gt; Date: Tue May 25 14:38:30 2010 +0200 Fixup transformations generator. ----------------------------------------------------------------------- Summary of changes: Documentation.html | 7 +------ libraries/transformations/generator.sh | 11 +---------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/Documentation.html b/Documentation.html index bbb7dfb..3a97d27 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2547,12 +2547,7 @@ setfacl -d -m "g:www-data:rwx" tmp <p> Please see the libraries/transformations/TEMPLATE file for adding your own transform function. See the libraries/transformations/TEMPLATE_MIMETYPE for adding a mimetype - without a transform function. Also note the introduction of a function description in - the language files. For each function a $strTransformation_[filename without .inc.php] - has to exist.</p> - -<p> You can use the template generator to generate new functions and entries in the - language file.</p> + without a transform function.</p> <p> To create a new transform function please see <tt>libraries/transformations/template_generator.sh</tt>. diff --git a/libraries/transformations/generator.sh b/libraries/transformations/generator.sh index 0d0d6fa..aa4900e 100755 --- a/libraries/transformations/generator.sh +++ b/libraries/transformations/generator.sh @@ -18,16 +18,7 @@ fi functionupper="`echo $2 | tr [:lower:] [:upper:]`" functionlower="`echo $2 | tr [:upper:] [:lower:]`" -cat $1 | sed "s/\[ENTER_FILENAME_HERE\]/$functionupper/" | sed "s/\[enter_filename_here\]/$functionlower/" >> $2.inc.php - -if [ "$3" ] -then - echo "" - echo "To do later:" - echo "cd ../../lang" - echo "./add_message.sh '\$strTransformation_${functionlower}' '$3'" - echo "" -fi +sed "s/\[ENTER_FILENAME_HERE\]/$functionupper/; s/\[enter_filename_here\]/$functionlower/; s/Description of the transformation./$3/;" < $1 > $2.inc.php echo "Created $2.inc.php" echo "" hooks/post-receive -- phpMyAdmin