Changeset 1502

Timestamp:

06/17/06 08:49:26 (2 years ago)

Author:

mdodoo

Message:

Fixes #55. Moves constants related to tags into constants.php. Attempts to update most translations to make LBL_ADMIN_CANT_RENAME more generic.

Location:

trunk/gregarius

Files:

• admin/index.php (modified) (5 diffs)
• admin/tags.php (added)
• constants.php (modified) (1 diff)
• intl/de.php (modified) (1 diff)
• intl/en.php (modified) (1 diff)
• intl/es.php (modified) (1 diff)
• intl/it.php (modified) (1 diff)
• intl/ja.php (modified) (1 diff)
• intl/pt_BR.php (modified) (1 diff)
• tags.php (modified) (1 diff)

trunk/gregarius/admin/index.php

@@ -42 +42 @@
 require_once('plugins.php');
 require_once('themes.php');
+require_once('tags.php');
 
 define ('CST_ADMIN_DOMAIN','domain');
@@ -67 +68 @@
 define ('CST_ADMIN_DOMAIN_THEMES','themes');
 define ('CST_ADMIN_DOMAIN_THEME_OPTIONS','theme_options');
+define ('CST_ADMIN_DOMAIN_TAGS','tags');
 // OPML import target
 define ('CST_ADMIN_OPML_IMPORT_WIPE',1);
@@ -127 +129 @@
                 $show = themes_admin();
                 break;
+            case CST_ADMIN_DOMAIN_TAGS:
+                $show = tags_admin();
+                break;
             case CST_ADMIN_DOMAIN_PLUGIN_OPTIONS:
                 $show = plugin_options_admin();
@@ -172 +177 @@
                 themes();
                 break;
+            case CST_ADMIN_DOMAIN_TAGS:
+                tags();
+                break;
             case CST_ADMIN_DOMAIN_PLUGIN_OPTIONS:
                 plugin_options();
@@ -215 +223 @@
                  array (CST_ADMIN_DOMAIN_THEMES, LBL_ADMIN_DOMAIN_THEMES_LBL),
                  array (CST_ADMIN_DOMAIN_FOLDER, LBL_ADMIN_DOMAIN_FOLDER_LBL),
-                 array (CST_ADMIN_DOMAIN_OPML, LBL_ADMIN_DOMAIN_LBL_OPML_LBL)) as $item) {
+                 array (CST_ADMIN_DOMAIN_OPML, LBL_ADMIN_DOMAIN_LBL_OPML_LBL),
+                 array (CST_ADMIN_DOMAIN_TAGS, LBL_TAG_TAGS)) as $item) {
 
         $link = "index.php?view=".$item[0];

trunk/gregarius/constants.php

@@ -158 +158 @@
 define ('ITEM_SORT_HINT_MIXED', 0x02);
 
+// an item should have this many tags, at most
+define('MAX_TAGS_PER_ITEM', 5);
 
+// This regexp is used both in php and javascript, basically
+// it is used to filter out everything but the allowed tag
+// characters, plus a whitespace
+define('ALLOWED_TAGS_REGEXP', '/[^a-zA-Z0-9\ _\.]/');
 
 // Sanitizer constants

trunk/gregarius/intl/de.php

@@ -191 +191 @@
 define ('LBL_ADMIN_BAD_RSS_URL',"Entschuldige, ich kann diese URL nicht verarbeiten: '%s'");
 define ('LBL_ADMIN_ERROR_CANT_DELETE_HOME_FOLDER',"Du kannst den " . LBL_HOME_FOLDER . " Ordner nicht löschen");
-define ('LBL_ADMIN_CANT_RENAME',"Du kannst den Ordner '%s' nicht umbenennen, da ein solcher schon existiert.");
+define ('LBL_ADMIN_CANT_RENAME',"Du kannst den Artikel '%s' nicht umbenennen, da ein solcher schon existiert.");
 define('LBL_ADMIN_ERROR_CANT_CREATE',"Der Ordner '%s' existiert schon!");
 

trunk/gregarius/intl/en.php

@@ -199 +199 @@
 define ('LBL_ADMIN_BAD_RSS_URL',"I'm sorry, I don't think I can handle this URL: '%s'");
 define ('LBL_ADMIN_ERROR_CANT_DELETE_HOME_FOLDER',"You can't delete the " . LBL_HOME_FOLDER . " folder");
-define ('LBL_ADMIN_CANT_RENAME',"You can't rename this folder '%s' because such a folder already exists.");
+define ('LBL_ADMIN_CANT_RENAME',"You can't rename this item '%s' because such an item already exists.");
 define('LBL_ADMIN_ERROR_CANT_CREATE',"Looks like you already have a folder called '%s'!");
 

trunk/gregarius/intl/es.php

@@ -193 +193 @@
 define ('LBL_ADMIN_BAD_RSS_URL',"Lo siento, creo que no podemos hacer nada con esta URL: '%s'");
 define ('LBL_ADMIN_ERROR_CANT_DELETE_HOME_FOLDER',"No puede eliminar la carpeta " . LBL_HOME_FOLDER);
-define ('LBL_ADMIN_CANT_RENAME',"No puede renombrar esta carpeta '%s' porque la otra ya existe.");
+define ('LBL_ADMIN_CANT_RENAME',"No puede renombrar esta tema '%s' porque la otra ya existe.");
 define ('LBL_ADMIN_ERROR_CANT_CREATE',"Ahora tiene una carpeta llamada '%s'!");
 

trunk/gregarius/intl/it.php

@@ -196 +196 @@
 define ('LBL_ADMIN_BAD_RSS_URL',"Spiacente, non so cosa fare con questa URL: '%s'");
 define ('LBL_ADMIN_ERROR_CANT_DELETE_HOME_FOLDER',"Non potete cancellare la cartella " . LBL_HOME_FOLDER);
-define ('LBL_ADMIN_CANT_RENAME',"Non puoi rinominare la cartella in '%s' Perché una cartella con quel nome esiste gia.");
+define ('LBL_ADMIN_CANT_RENAME',"Non puoi rinominare le elemento in '%s' Perché un elemento con quel nome esiste gia.");
 define('LBL_ADMIN_ERROR_CANT_CREATE',"Una cartella chiamata '%s' esiste gia!");
 

trunk/gregarius/intl/ja.php

@@ -205 +205 @@
 define ('LBL_ADMIN_BAD_RSS_URL',"I'm sorry, I don't think I can handle this URL: '%s'");
 define ('LBL_ADMIN_ERROR_CANT_DELETE_HOME_FOLDER',"You can't delete the " . LBL_HOME_FOLDER . " folder");
-define ('LBL_ADMIN_CANT_RENAME',"You can't rename this folder '%s' because such a folder already exists.");
+define ('LBL_ADMIN_CANT_RENAME',"You can't rename this item '%s' because such an item already exists.");
 define('LBL_ADMIN_ERROR_CANT_CREATE',"Looks like you already have a folder called '%s'!");
 

trunk/gregarius/intl/pt_BR.php

@@ -190 +190 @@
 define ('LBL_ADMIN_BAD_RSS_URL',"Sinto muito, eu acho que não posso tratar esta URL: '%s'");
 define ('LBL_ADMIN_ERROR_CANT_DELETE_HOME_FOLDER',"Você não pode excluir a pasta " . LBL_HOME_FOLDER . "");
-define ('LBL_ADMIN_CANT_RENAME',"Você não pode renomear a pasta '%s' porque tal pasta já existe.");
+define ('LBL_ADMIN_CANT_RENAME',"Você não pode renomear a íten '%s' porque tal íten já existe.");
 define('LBL_ADMIN_ERROR_CANT_CREATE',"Parace que você já tem uma pasta chamada '%s'!");
 

trunk/gregarius/tags.php

@@ -27 +27 @@
 
 require_once ('init.php');
-
-// an item should have this many tags, at most
-define('MAX_TAGS_PER_ITEM', 5);
-
-// This regexp is used both in php and javascript, basically
-// it is used to filter out everything but the allowed tag
-// characters, plus a whitespace
-define('ALLOWED_TAGS_REGEXP', '/[^a-zA-Z0-9\ _\.]/');
 
 function relatedTags($tags) {