Changeset 11342


Ignore:
Timestamp:
Jun 13, 2011, 8:19:29 PM (9 years ago)
Author:
grum
Message:

fix feature:2333 - add CC0 and PD licenses

Location:
extensions/lmt
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • extensions/lmt/language/en_UK/plugin.lang.php

    r7560 r11342  
    169169$lang['lmt_error_num_items']="At least, one licence must be selected";
    170170
     171// 1.3.1
     172$lang['lmt_lbl_cc-cc0'] = 'No Rights Reserved';
     173$lang['lmt_lbl_cc_s-cc0'] = 'Creative Commons 0';
     174$lang['lmt_lbl_under-cc0'] = 'Published under license';
     175
     176$lang['lmt_lbl_cc-pd'] = 'Public Domain';
     177$lang['lmt_lbl_cc_s-pd'] = 'Public Domain';
     178$lang['lmt_lbl_under-pd'] = '';
     179
     180
    171181?>
  • extensions/lmt/language/fr_FR/plugin.lang.php

    r7560 r11342  
    197197$lang['lmt_error_num_items']="Au moins une licence doit être sélectionnée";
    198198
     199// 1.3.1
     200$lang['lmt_lbl_cc-cc0'] = 'Aucun droits réservés';
     201$lang['lmt_lbl_cc_s-cc0'] = 'Creative Commons 0';
     202$lang['lmt_lbl_under-cc0'] = 'Publié sous licence';
     203
     204$lang['lmt_lbl_cc-pd'] = 'Domaine Publique';
     205$lang['lmt_lbl_cc_s-pd'] = 'Domaine Publique';
     206$lang['lmt_lbl_under-pd'] = '';
     207
     208
    199209?>
  • extensions/lmt/lmt_aip.class.inc.php

    r10974 r11342  
    202202         $_REQUEST['filter']=="BY-NC" ||
    203203         $_REQUEST['filter']=="CRIGHT" ||
    204          $_REQUEST['filter']=="CLEFT"
     204         $_REQUEST['filter']=="CLEFT" ||         
     205         $_REQUEST['filter']=="CC0" ||
     206         $_REQUEST['filter']=="PD"
    205207      ))
    206208    {
  • extensions/lmt/lmt_ajax.php

    r7560 r11342  
    8585           $_REQUEST['filter']=="BY-NC" ||
    8686           $_REQUEST['filter']=="CRIGHT" ||
    87            $_REQUEST['filter']=="CLEFT"
     87           $_REQUEST['filter']=="CLEFT" ||
     88           $_REQUEST['filter']=="CC0" ||
     89           $_REQUEST['filter']=="PD"
    8890        ))
    8991      {
  • extensions/lmt/lmt_root.class.inc.php

    r10974 r11342  
    2222  protected $css_icn;   //the css object
    2323
    24   static public $licences=array('BY', 'BY-ND', 'BY-NC', 'BY-NC-ND', 'BY-NC-SA', 'BY-SA', 'CRIGHT', 'CLEFT', 'DEFAULT');
     24  static public $licences=array('BY', 'BY-ND', 'BY-NC', 'BY-NC-ND', 'BY-NC-SA', 'BY-SA', 'CRIGHT', 'CLEFT', 'CC0', 'PD', 'DEFAULT');
    2525
    2626  /**
     
    105105      $this->config['lmt_redirect_url-cright'][$key]='';
    106106      $this->config['lmt_redirect_url-cleft'][$key]='';
     107      $this->config['lmt_redirect_url-cc0'][$key]='http://creativecommons.org/about/cc0';
     108      $this->config['lmt_redirect_url-pd'][$key]='http://en.wikipedia.org/wiki/Public_domain';
    107109    }
    108110  }
  • extensions/lmt/lmt_version.inc.php

    r10974 r11342  
    1515  if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
    1616
    17   define('LMT_VERSION',  '1.3.0');
    18   define('LMT_VERSION2', '01.03.00');
     17  define('LMT_VERSION',  '1.3.1');
     18  define('LMT_VERSION2', '01.03.01');
    1919  define('LMT_GPC_NEEDED', '3.5.1');
    2020?>
  • extensions/lmt/main.inc.php

    r11032 r11342  
    22/*
    33Plugin Name: LMT
    4 Version: 1.3.0
     4Version: 1.3.1
    55Description: Appliquer une licence sur ses photos / Apply a licence on photos
    66Plugin URI: http://piwigo.org/ext/extension_view.php?eid=282
     
    6363|         |            |   . slashes should be stripped when displaying author
    6464|         |            |     names
    65 |         |            | * mantis feature:
     65|         |            | * mantis feature:2150
    6666|         |            |   . compatibility with piwigo 2.2
    6767|         |            | * mantis bug:1689
    6868|         |            |   . Add possibility to search picture by licence
    6969|         |            |
     70| 1.3.1   | 2011/06/13 | * mantis : feature 2333
     71|         |            |   . Add the Public Domain licence.
    7072|         |            |
     73|         |            |
     74|         |            |
     75|         |            |
     76
     77
     78
    7179
    7280
Note: See TracChangeset for help on using the changeset viewer.