Context Navigation

← Previous Changeset
Next Changeset →

Changeset 1492

Timestamp:

06/12/06 19:23:42 (3 years ago)

Author:

spetersen

Message:

Another merge to bring the PostgreSQL branch up to SVN change 1491.

Location:

branches/postgresql

Files:

: 6 modified
: 1 copied

cls/update.php (modified) (1 diff)
dist/l10n.sh (copied) (copied from trunk/gregarius/dist/l10n.sh)
intl/es.php (modified) (9 diffs)
plugins.php (modified) (2 diffs)
themes/default/rss/item.php (modified) (1 diff)
themes/lilina/web/item.php (modified) (2 diffs)
themes/lilina/web/js/lilina.js (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/postgresql/cls/update.php

r1491	r1492
26	26	###############################################################################
27	27
28		~~require_once ('init.php');~~
29		~~rss_require('cls/config.php');~~
30
31	28	define('PUSH_BOUNDARY', "-------- =_aaaaaaaaaa0");
32	29	define('ERROR_NOERROR', "");

branches/postgresql/intl/es.php

r1484	r1492
72	72
73	73
74		define ('LBL_HOME_FOLDER','Raiz');
	74	define ('LBL_HOME_FOLDER','Raíz');
75	75	define ('LBL_VISIT', '(visitado)');
76	76	define ('LBL_COLLAPSE','[-] recoger');
…	…
83	83
84	84	define ('LBL_UPDATE_STATUS_OK','OK');
85		define ('LBL_UPDATE_STATUS_CACHED', 'OK (Cache local)');
	85	define ('LBL_UPDATE_STATUS_CACHED', 'OK (Caché local)');
86	86	define ('LBL_UPDATE_STATUS_ERROR','ERROR');
87		define ('LBL_UPDATE_H2','Actualizando %d ~~tema~~s...');
	87	define ('LBL_UPDATE_H2','Actualizando %d canales...');
88	88	define ('LBL_UPDATE_CACHE_TIMEOUT','No se pudo recuperar (Cache local)');
89	89	define ('LBL_UPDATE_NOT_MODIFIED','OK (Sin modificaciones)');
…	…
108	108	define ('LBL_ADMIN_OK','Aceptar');
109	109	define ('LBL_ADMIN_CANCEL','Cancelar');
110		~~//FIXME:~~
111	110	define ('LBL_ADMIN_LOGOUT','Desconectar');
	111	define ('LBL_ADMIN_CONFIGURE','Configuración');
112	112
113	113	define ('LBL_ADMIN_OPML_IMPORT','Importar');
…	…
143	143	define ('LBL_ADMIN_PLUGINS_HEADING_DESCRIPTION','Descripcion');
144	144	define ('LBL_ADMIN_PLUGINS_HEADING_ACTION','Activo');
145
146
147
	145	define ('LBL_ADMIN_PLUGINS_HEADING_OPTIONS', 'Opciones');
148	146
149	147	define ('LBL_ADMIN_CHANNEL_EDIT_CHANNEL','Editar canal ');
150		define ('LBL_ADMIN_CHANNEL_NAME','Titulo:');
	148	define ('LBL_ADMIN_CHANNEL_NAME','Título:');
151	149	define ('LBL_ADMIN_CHANNEL_RSS_URL','URL RSS:');
152	150	define ('LBL_ADMIN_CHANNEL_SITE_URL','URL Sitio:');
…	…
155	153	define ('LBL_ADMIN_FOLDER_NAME','Nombre carpeta:');
156	154	define ('LBL_ADMIN_CHANNEL_PRIVATE','El canal es <strong>privado</strong>, solo lo ven los administradores');
157		define ('LBL_ADMIN_CHANNEL_DELETED','El tema <strong>no esta aprovado</strong>, no será puesto al día más y no será visible en la columna de las canales.');
	155	define ('LBL_ADMIN_CHANNEL_DELETED','El tema <strong>no esta aprobado</strong>, no será puesto al día más y no será visible en la columna de las canales.');
158	156
159	157	define ('LBL_ADMIN_ARE_YOU_SURE', "Está seguro de querer eliminar '%s'?");
…	…
191	189	."Le deseamos un buen día!");
192	190
193		define ('LBL_ADMIN_ERROR_PRUNING_PERIOD','Periodo de limpieza no valido');
	191	define ('LBL_ADMIN_ERROR_PRUNING_PERIOD','Periodo de limpieza no válido');
194	192	define ('LBL_ADMIN_ERROR_NO_PERIOD','Oops, no ha especificado un periodo');
195	193	define ('LBL_ADMIN_BAD_RSS_URL',"Lo siento, creo que no podemos hacer nada con esta URL: '%s'");
…	…
219	217	define ('LBL_STATE_PRIVATE','Privado (Solo los administradores pueden ver estos temas)');
220	218	define ('LBL_STICKY','Destacado');
221		define ('LBL_DEPRECATED','No aprovado');
	219	define ('LBL_DEPRECATED','No aprobado');
222	220	define ('LBL_PRIVATE','Privado');
223	221	define ('LBL_ADMIN_STATE','Estado:');
…	…
238	236	define ('LBL_ADMIN_OPML_IMPORT_FEED_INFO','Importando %s a %s... ');
239	237
240		define ('LBL_TAG_FOLDERS','Categorias');
	238	define ('LBL_TAG_FOLDERS','Categorías');
241	239	define ('LBL_SIDE_ITEMS','(%d temas)');
242	240	define ('LBL_SIDE_UNREAD_FEEDS','(%d sin leer en %d feeds)');
…	…
246	244
247	245	// New in 0.5.3:
248		define('LBL_ENCLOSURE', 'Recipiente:');
249		define('LBL_DOWNLOAD', 'descargar');
250		define('LBL_PLAY', 'reproducir');
251		define('LBL_FOOTER_LAST_MODIF_NEVER', 'Never');
252		define ('LBL_ADMIN_DASHBOARD','Dashboard');
253
254
255		define ('LBL_ADMIN_MUST_SET_PASS','<p>No Administrator has been specified yet!</p>'
256		.'<p>Please provide an Administrator username and password now!</p>');
257		define ('LBL_USERNAME','Username');
258		define ('LBL_PASSWORD','Password');
259		define ('LBL_PASSWORD2','Password (again)');
260		define ('LBL_ADMIN_LOGIN','Please log in');
261		define ('LBL_ADMIN_PASS_NO_MATCH','Passwords do not match!');
	246	define ('LBL_ENCLOSURE', 'Recipiente:');
	247	define ('LBL_DOWNLOAD', 'descarga');
	248	define ('LBL_PLAY', 'reproducir');
	249
	250	define ('LBL_MARK_READ', "Marcar como leído");
	251	define ('LBL_MARK_CHANNEL_READ', "Marcar como leído");
	252	define ('LBL_MARK_FOLDER_READ',"Marcar como leído");
	253
	254	define ('LBL_MARK_CHANNEL_READ_ALL', "Marcar este canal como leído");
	255	define ('LBL_MARK_FOLDER_READ_ALL',"Marcar esta carpeta como leída");
	256	define ('LBL_MARK_CATEGORY_READ_ALL',"Marcar esta categoría como leída");
	257
	258	// New in 0.5.x:
	259	define ('LBL_FOOTER_LAST_MODIF_NEVER', 'Nunca');
	260	define ('LBL_ADMIN_DASHBOARD','Dashboard');
	261
	262	define ('LBL_ADMIN_MUST_SET_PASS','<p>No se ha configurado un Administrador todavía!</p>'
	263	.'<p>Por favor, introduzca un usuario y contraseña para el Administrador!</p>');
	264	define ('LBL_USERNAME','Usuario');
	265	define ('LBL_PASSWORD','Contraseña');
	266	define ('LBL_PASSWORD2','Contraseña (repita)');
	267	define ('LBL_ADMIN_LOGIN','Indentifíquese, por favor');
	268	define ('LBL_ADMIN_PASS_NO_MATCH','Las contraseñas no son iguales!');
262	269
263	270	define ('LBL_ADMIN_PLUGINS','Plugins');
264	271	define ('LBL_ADMIN_DOMAIN_PLUGINS_LBL','plugins');
265		define ('LBL_ADMIN_PLUGINS_HEADING_OPTIONS','Options');
266		define ('LBL_ADMIN_PLUGINS_OPTIONS','Plugin Options');
267		define ('LBL_ADMIN_CHECK_FOR_UPDATES','Check for Updates');
268		define ('LBL_ADMIN_LOGIN_BAD_LOGIN','<strong>Oops!</strong> Bad login/password');
269		define ('LBL_ADMIN_LOGIN_NO_ADMIN','<strong>Oops!</strong> You are successfully '
270		.'logged in as %s, but you don\\\'t have administration privileges. Log in again '
271		.'with administration privileges or follow your way <a href="..">home</a>');
272
	272	define ('LBL_ADMIN_PLUGINS_HEADING_UPDATES','Actualización disponible');
	273	define ('LBL_ADMIN_CHECK_FOR_UPDATES','Comprobar actualizaciones');
	274	define ('LBL_ADMIN_LOGIN_BAD_LOGIN','<strong>Oops!</strong> Usuario/contrasea incorrectos');
	275	define ('LBL_ADMIN_LOGIN_NO_ADMIN','<strong>Oops!</strong> Ha sido identificado '
	276	.'correctamente como %s, pero no tiene privilegios de administracin. Por favor, conéctese con '
	277	.'un usuario con derechos de administracin o vuelva a <a href="..">Inicio</a>');
	278
	279	define('LBL_ADMIN_ACTIVE_THEME','Tema activo');
	280	define('LBL_ADMIN_USE_THIS_THEME','Usar este tema');
273	281
274	282	define ('LBL_ADMIN_PLUGINS_GET_MORE', '<p style="font-size:small">'
275		.'Plugins are third-party scripts that offer extended functionalities. '
276		.'More plugins can be downloaded at the <a style="text-decoration:underline" '
277		.' href="http://plugins.gregarius.net/">Plugin Repository</a>.</p>');
278
279		define ('LBL_LAST_UPDATE','Last update');
280		define ('LBL_ADMIN_DOMAIN_THEMES_LBL','themes');
281		define ('LBL_ADMIN_THEMES','Themes');
282		define('LBL_ADMIN_ACTIVE_THEME','Active Theme');
283		define('LBL_ADMIN_USE_THIS_THEME','Use this Theme');
284		define('LBL_ADMIN_CONFIGURE','Configure');
285		define('LBL_ADMIN_THEME_OPTIONS','Theme Options');
	283	.'Los plugins son código escrito por otros desarrolladores para ofrecer más funciones. '
	284	.'Se pueden descargar más plugins desde <a style="text-decoration:underline" '
	285	.' href="http://plugins.gregarius.net/">Repositorio de Plugins</a>.</p>');
	286
	287	define ('LBL_LAST_UPDATE','Última actualización');
	288	define ('LBL_ADMIN_DOMAIN_THEMES_LBL','temas');
	289	define ('LBL_ADMIN_THEMES','Temas');
286	290
287	291	define ('LBL_ADMIN_THEMES_GET_MORE', '<p style="font-size:small">'
288		.'Themes are made of a set of template files which specify how your Gregarius installation looks.<br />'
289		.'More themes can be downloaded at the <a style="text-decoration:underline" '
290		.' href="http://themes.gregarius.net/">Themes Repository</a>.</p>');
291
292		define ('LBL_STATE_FLAG','Flag (Flags an item for later reading)');
293		define ('LBL_FLAG','Flagged');
294
295		define ('LBL_MARK_READ', "Marcar todos como leidos");
296		define ('LBL_MARK_CHANNEL_READ', "Marcar este como leido");
297		define ('LBL_MARK_FOLDER_READ',"Marcar esta carpeta como leida");
298
299		define ('LBL_MARK_CHANNEL_READ_ALL', "Mark This Feed as Read");
300		define ('LBL_MARK_FOLDER_READ_ALL',"Mark This Folder as Read");
301		define ('LBL_MARK_CATEGORY_READ_ALL',"Mark This Category as Read");
	292	.'Los temas permiten cambiar el aspecto de Gregarius.<br />'
	293	.'Se pueden descargar más temas desde <a style="text-decoration:underline" '
	294	.' href="http://themes.gregarius.net/">Repositorio de Temas</a>.</p>');
	295
	296	define ('LBL_STATE_FLAG','Marca (Marca un item para leerlo más tarde)');
	297	define ('LBL_FLAG','Marcado');
302	298	?>

branches/postgresql/plugins.php

r1393	r1492
103	103	/**
104	104	* Wrapper functions for plugins
	105	*
	106	* Notes: Make sure that $value and $default are not escaped strings/arrays of strings,
	107	* otherwise they will not come out of the database correctly because of rss_real_escape_string
105	108	*/
106	109	function rss_plugins_add_option($key, $value, $type = "string", $default = "", $desc= "", $export = NULL) {
…	…
111	114
112	115	if (is_array($value) \|\| $type == 'array') {
113		$value = s~~tr_replace("'","\'",serialize($value)~~);
	116	$value = serialize($value);
114	117	}
115	118	$value = rss_real_escape_string($value);

branches/postgresql/themes/default/rss/item.php

r1393	r1492
4	4	<pubDate><?php echo rss_item_date_with_format('r'); ?></pubDate>
5	5	<guid><?php echo rss_item_url(); ?></guid>
	6	<?php if (rss_item_has_enclosure()) { ?>
	7	<enclosure url="<?php echo rss_item_enclosure(); ?>" length="" type="" />
	8	<?php } ?>
6	9	<content:encoded><![CDATA[ <?php echo rss_item_content(); ?> ]]></content:encoded>
7	10	</item>

branches/postgresql/themes/lilina/web/item.php

r1484	r1492
37	37	<div id="sad<?php echo rss_item_id(); ?>" style="display:none"></div>
38	38	<h5><?php echo rss_item_date(); ?><?php echo rss_item_author(); ?></h5>
39		<?php if (rss_item_do_rating()) { ?>
40		<div class="rating">
41		<h5><?php echo LBL_RATING; ?></h5>
42		<?php echo rss_item_rating(); ?>
43		<?php rss_item_rating(); ?>
	39	<div id="im<?php echo rss_item_id(); ?>">
	40	<?php if (rss_item_do_rating()) { ?>
	41	<div class="rating">
	42	<h5><?php echo LBL_RATING; ?></h5>
	43	<?php echo rss_item_rating(); ?>
	44	<?php rss_item_rating(); ?>
	45	</div>
	46	<?php } ?>
	47	<?php if (_VERSION_ > "0.5.2" && rss_item_has_enclosure()) { ?>
	48	<h5><?php echo LBL_ENCLOSURE; ?> [<a href="<?php echo rss_item_enclosure(); ?>"><?php echo LBL_DOWNLOAD; ?></a><?php rss_plugin_hook("rss.plugins.items.enclosure", null); ?>]</h5>
	49	<?php } ?>
	50	<?php if (rss_item_display_tags()) { ?>
	51	<h5>
	52	<a href="<?php echo rss_item_tagslink(); ?>"><?php echo LBL_TAG_TAGS; ?></a>:
	53	<span id="t<?php echo rss_item_id(); ?>"><?php echo rss_item_tags(); ?></span>
	54	<?php if (rss_item_can_edit_tags()) { ?>
	55	[<span id="ta<?php echo rss_item_id(); ?>"><a href="#" onclick="_et(<?php echo rss_item_id(); ?>); return false;"><?php echo LBL_TAG_EDIT; ?></a></span>]
	56	<?php } ?>
	57	</h5>
	58	<?php } ?>
44	59	</div>
45		~~<?php } ?>~~
46		~~<?php if (_VERSION_ > "0.5.2" && rss_item_has_enclosure()) { ?>~~
47		~~<h5><?php echo LBL_ENCLOSURE; ?> [<a href="<?php echo rss_item_enclosure(); ?>"><?php echo LBL_DOWNLOAD; ?></a><?php rss_plugin_hook("rss.plugins.items.enclosure", null); ?>]</h5>~~
48		~~<?php } ?>~~
49		~~<?php if (rss_item_display_tags()) { ?>~~
50		~~<h5>~~
51		~~<a href="<?php echo rss_item_tagslink(); ?>"><?php echo LBL_TAG_TAGS; ?></a>: ~~
52		~~<span id="t<?php echo rss_item_id(); ?>"><?php echo rss_item_tags(); ?></span> ~~
53		~~<?php if (rss_item_can_edit_tags()) { ?>~~
54		~~[<span id="ta<?php echo rss_item_id(); ?>"><a href="#" onclick="_et(<?php echo rss_item_id(); ?>); return false;"><?php echo LBL_TAG_EDIT; ?></a></span>]~~
55		~~<?php } ?>~~
56		~~</h5>~~
57		~~<?php } ?>~~
58	60	<div class="content" id="c<?php echo rss_item_id(); ?>">
59	61	<?php echo rss_item_content(); ?>
…	…
91	93	<?php echo rss_feed_title();?></a>
92	94	<div id="sad<?php echo rss_item_id(); ?>" style="display:none"></div>
	95	<div id="im<?php echo rss_item_id(); ?>" style="display:none">
	96	<?php if (rss_item_do_rating()) { ?>
	97	<div class="rating">
	98	<h5><?php echo LBL_RATING; ?></h5>
	99	<?php echo rss_item_rating(); ?>
	100	<?php rss_item_rating(); ?>
	101	</div>
	102	<?php } ?>
	103	<?php if (_VERSION_ > "0.5.2" && rss_item_has_enclosure()) { ?>
	104	<h5><?php echo LBL_ENCLOSURE; ?> [<a href="<?php echo rss_item_enclosure(); ?>"><?php echo LBL_DOWNLOAD; ?></a><?php rss_plugin_hook("rss.plugins.items.enclosure", null); ?>]</h5>
	105	<?php } ?>
	106	<?php if (rss_item_display_tags()) { ?>
	107	<h5>
	108	<a href="<?php echo rss_item_tagslink(); ?>"><?php echo LBL_TAG_TAGS; ?></a>:
	109	<span id="t<?php echo rss_item_id(); ?>"><?php echo rss_item_tags(); ?></span>
	110	<?php if (rss_item_can_edit_tags()) { ?>
	111	[<span id="ta<?php echo rss_item_id(); ?>"><a href="#" onclick="_et(<?php echo rss_item_id(); ?>); return false;"><?php echo LBL_TAG_EDIT; ?></a></span>]
	112	<?php } ?>
	113	</h5>
	114	<?php } ?>
	115	</div>
93	116	<div class="content" id="c<?php echo rss_item_id(); ?>" style="display:none">
94	117	<?php echo rss_item_content(); ?>

branches/postgresql/themes/lilina/web/js/lilina.js

r1393	r1492
1	1	function toggleItemByID(id) {
2		var fld=document.getElementById("c" + id);
	2	var fld=document.getElementById("im" + id);
	3	var fld2=document.getElementById("c" + id);
3	4	if (fld.style.display == "none") {
4	5	fld.style.display = "block";
	6	fld2.style.display = "block";
5	7	} else {
6	8	fld.style.display = "none";
	9	fld2.style.display = "none";
7	10	}
8	11	}

Download in other formats: