From 221b34ca5cb0f9fc8f7c61ad66c1719c9b7a2a0d Mon Sep 17 00:00:00 2001 From: Maurice Svay Date: Thu, 8 Aug 2013 10:55:36 +0200 Subject: [PATCH 1/4] Update README with installation instructions --- README.markdown | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 78c9b91..6928d26 100644 --- a/README.markdown +++ b/README.markdown @@ -9,11 +9,18 @@ It can be used to blend articles from different blogs with same interests into a Moonmoon is stupidly simple: it only aggregates feeds and spits them out in one single page. It does not archive articles, it does not do comments nor votes. - Requirements ------------ Web hosting with PHP5.3 (PHP4 & 5.2 will not work). + +Installing +---------- +* Upload all the files to your server (with FTP or other) +* Open install.php with your browser +* Follow the instructions + + License ------- Moonmoon is free software and is released under BSD license. From 8047a080cb6de7693f1bb51216078f46e1624033 Mon Sep 17 00:00:00 2001 From: Maurice Svay Date: Sun, 17 Nov 2013 13:51:41 +0100 Subject: [PATCH 2/4] Remove timeout --- app/classes/Planet.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/classes/Planet.class.php b/app/classes/Planet.class.php index 81a71fe..c5823e1 100644 --- a/app/classes/Planet.class.php +++ b/app/classes/Planet.class.php @@ -110,7 +110,6 @@ public function loadOpml($file) public function loadFeeds() { foreach ($this->people as $feed) { - $feed->set_timeout(-1); $feed->init(); $this->items = array_merge($this->items, $feed->get_items()); } From 89b7cd9498165f7057ea81d7156bc96aac435ce1 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Wed, 4 Dec 2013 15:38:39 +0800 Subject: [PATCH 3/4] Only produce output if there are any errors to report. --- cron.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cron.php b/cron.php index 77d9d8f..f8fc8ce 100644 --- a/cron.php +++ b/cron.php @@ -6,4 +6,6 @@ $Planet->download(1.0); } -var_dump($Planet->errors); +foreach ($Planet->errors as $error) { + echo $error->toString()."\n"; +} From b37de7f1afab72e266a1d25b6635f20e8b025f88 Mon Sep 17 00:00:00 2001 From: Maurice Svay Date: Wed, 19 Feb 2014 23:41:56 +0100 Subject: [PATCH 4/4] Add spanish translation, contributed by Javier Guerra --- LICENSE | 1 + app/l10n/es.lang | 244 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+) create mode 100644 app/l10n/es.lang diff --git a/LICENSE b/LICENSE index 8d83edd..bb0603a 100644 --- a/LICENSE +++ b/LICENSE @@ -30,3 +30,4 @@ Contributors: François Granger Pep, http://www.callmepep.org/ Pascal Chevrel +Javier Guerra diff --git a/app/l10n/es.lang b/app/l10n/es.lang new file mode 100644 index 0000000..11b80df --- /dev/null +++ b/app/l10n/es.lang @@ -0,0 +1,244 @@ +# Translation note: ¿Está seguro que desea vaciar la caché? +;Are you sure you want to purge the cache? +¿Está seguro de que desea vaciar la caché? + + +# Translation note: Vaciar la caché +;Clear cache +Vaciar la caché + + +# Translation note: Vaciar la caché: +;Clear cache: +Vaciar la caché: + + +;Clear +Vaciar + + +# Translation note: Vaciar la caché hará que moonmoon recargue todas las fuentes web. +;Clearing the cache will make moonmoon reload all feeds. +Vaciar la caché hará que moonmoon recargue todas las fuentes web. + + +# Translation note: Cambiar la contraseña de administración +;Change administrator password +Cambiar la contraseña de administración + + +# Translation note: Nueva contraseña: +;New password: +Nueva contraseña: + + +# Translation note: Cambiar la contraseña +;Change password +Cambiar la contraseña + + +# Translation note: Añadir una nueva fuente web - 'feed' = 'fuente web', 'fuente' or 'canal' in spanish, but you can use 'feed' anyway. +;Add a new feed +Añadir una nueva fuente web + + +# Translation note: Añadir fuente +;Add Feed +Añadir fuente + + +;Link: +Enlace: + + +# Translation note: Los formatos aceptados son RSS y ATOM. Si el enlace no es una fuente web, moonmoon tratará de encontrar la fuente de forma automática. +;Accepted formats are RSS and ATOM. If the link is not a feed, moonmoon will try to autodiscover the feed. +Los formatos aceptados son RSS y ATOM. Si el enlace no es una fuente web, moonmoon tratará de encontrar la fuente de forma automática. + + +;Manage existing feeds +Administrar las fuentes existentes + + +# Translation note: Número de fuentes +;Number of feeds: %s +Número de fuentes: %s + + +;Save changes +Guardar cambios + + +;Delete selected Feeds +Borrar seleccionadas + + +;Select : +Seleccionar: + + +;All +Todas + + +;None +Ninguna + + +# Translation note: Selección +;Selection +Selección + + +;Name +Nombre + +# Translation note: Última entrada +;Last entry +Última entrada + + +;Website link +Enlace a la web + + +;Feed link +Enlace a la fuente + + +# Translation note: 'No está en caché' or 'No en caché' +;Not in cache +No está en caché + + +# Translation note: Contraseña: +;Password: +Contraseña: + + +;OK +Entrar + + +# Translation note: Administración de moonmoon +;moonmoon administration +Administración de moonmoon + + +# Translation note: Volver a la página principal +;Back to main page +Volver a la página principal + + +;Logout +Salir + + +;Feeds +Fuentes + + +# Translation note: Administración +;Administration +Administración + + +;Powered by moonmoon +Desarrollado por moonmoon + + +# Translation note: Sin artículos +;No article +Sin artículos + + +;No news, good news. +No hay noticias, buena noticia. + + +;Today +Hoy + + +# Translation note: Ir a la ubicación original +;Go to original place +Ir a la ubicación original + + +;This week +Esta semana + + +;This month +Este mes + + +;Older items +Titulares anteriores + + +# Translation note: 'People' = 'Personas', but 'fuentes'(sources), which in Spanish means origins, is more generic. +;People +Fuentes + + +;Feed +Fuente + + +;Website +Sitio web + + +;All feeds in OPML format +Todas las fuentes (OPML) + + +# Translation note: Redifusión +;Syndicate +Redifusión + + +;Feed (ATOM) +Fuente (ATOM) + + +;Archives +Archivos + + +;See all headlines +Ver todos los titulares + + +# Translation note: You may use 'Source' = 'Origen' too. +;Source: +Fuente: + + +;You might want to install moonmoon. +Es posible que desee instalar moonmoon. + + +# Translation note: Instalación de moonmoon +;moonmoon installation +Instalación de moonmoon + + +# Translation note: ¡Felicidades! Su moonmoon está preparado. +;Congratulations! Your moonmoon is ready. +¡Felicidades! Su moonmoon está preparado. + + +# Translation note: ¿Y ahora? +;What's next? +¿Y ahora? + + +;Delete install.php with your FTP software. +Borre install.php con su programa de FTP. + + +# Translation note: Utilice su contraseña para acceder al panel de administración. +;Use your password to go to the administration panel +Utilice su contraseña para acceder al panel de administración.