소스 검색

Un peu de typographie

* Remplace les tirets de soustraction par points médians ou des tirets
cadratins (si c'est trop long, nous pourrions mettre des
demi-cadratins).
* Met les abréviations des jours anglais en exposant, comme
`3<sup>rd</sup>`
Alexandre Alapetite 12 년 전
부모
커밋
b381d2a592

+ 9 - 9
app/Controllers/configureController.php

@@ -66,7 +66,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		$this->view->feeds = $feedDAO->listFeeds ();
 		$this->view->flux = false;
 
-		Minz_View::prependTitle (Minz_Translate::t ('categories_management') . ' - ');
+		Minz_View::prependTitle (Minz_Translate::t ('categories_management') . ' · ');
 	}
 
 	public function feedAction () {
@@ -133,10 +133,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 					Minz_Request::forward (array ('c' => 'configure', 'a' => 'feed', 'params' => array ('id' => $id)), true);
 				}
 
-				Minz_View::prependTitle (Minz_Translate::t ('rss_feed_management') . ' - ' . $this->view->flux->name () . ' - ');
+				Minz_View::prependTitle (Minz_Translate::t ('rss_feed_management') . ' — ' . $this->view->flux->name () . ' · ');
 			}
 		} else {
-			Minz_View::prependTitle (Minz_Translate::t ('rss_feed_management') . ' - ');
+			Minz_View::prependTitle (Minz_Translate::t ('rss_feed_management') . ' · ');
 		}
 	}
 
@@ -185,7 +185,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 
 		$this->view->themes = FreshRSS_Themes::get();
 
-		Minz_View::prependTitle (Minz_Translate::t ('reading_configuration') . ' - ');
+		Minz_View::prependTitle (Minz_Translate::t ('reading_configuration') . ' · ');
 	}
 
 	public function sharingAction () {
@@ -212,7 +212,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			Minz_Request::forward (array ('c' => 'configure', 'a' => 'sharing'), true);
 		}
 
-		Minz_View::prependTitle (Minz_Translate::t ('sharing_management') . ' - ');
+		Minz_View::prependTitle (Minz_Translate::t ('sharing') . ' · ');
 	}
 
 	public function importExportAction () {
@@ -277,7 +277,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		// au niveau de la vue, permet de ne pas voir un flux sélectionné dans la liste
 		$this->view->flux = false;
 
-		Minz_View::prependTitle (Minz_Translate::t ('import_export_opml') . ' - ');
+		Minz_View::prependTitle (Minz_Translate::t ('import_export_opml') . ' · ');
 	}
 
 	public function shortcutAction () {
@@ -313,11 +313,11 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			Minz_Request::forward (array ('c' => 'configure', 'a' => 'shortcut'), true);
 		}
 
-		Minz_View::prependTitle (Minz_Translate::t ('shortcuts_management') . ' - ');
+		Minz_View::prependTitle (Minz_Translate::t ('shortcuts') . ' · ');
 	}
 
 	public function usersAction() {
-		Minz_View::prependTitle(Minz_Translate::t ('users') . ' - ');
+		Minz_View::prependTitle(Minz_Translate::t ('users') . ' · ');
 	}
 
 	public function archivingAction () {
@@ -339,7 +339,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			Minz_Request::forward(array('c' => 'configure', 'a' => 'archiving'), true);
 		}
 
-		Minz_View::prependTitle(Minz_Translate::t('archiving_configuration') . ' - ');
+		Minz_View::prependTitle(Minz_Translate::t('archiving_configuration') . ' · ');
 
 		$entryDAO = new FreshRSS_EntryDAO();
 		$this->view->nb_total = $entryDAO->count();

+ 1 - 1
app/Controllers/errorController.php

@@ -21,6 +21,6 @@ class FreshRSS_error_Controller extends Minz_ActionController {
 		
 		$this->view->logs = Minz_Request::param ('logs');
 		
-		Minz_View::prependTitle ($this->view->code . ' - ');
+		Minz_View::prependTitle ($this->view->code . ' · ');
 	}
 }

+ 3 - 3
app/Controllers/indexController.php

@@ -83,7 +83,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		Minz_View::prependTitle (
 			$this->view->currentName .
 			($this->nb_not_read_cat > 0 ? ' (' . $this->nb_not_read_cat . ')' : '') .
-			' - '
+			' · '
 		);
 
 		// On récupère les différents éléments de filtrage
@@ -204,7 +204,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	}
 
 	public function aboutAction () {
-		Minz_View::prependTitle (Minz_Translate::t ('about') . ' - ');
+		Minz_View::prependTitle (Minz_Translate::t ('about') . ' · ');
 	}
 
 	public function logsAction () {
@@ -215,7 +215,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			);
 		}
 
-		Minz_View::prependTitle (Minz_Translate::t ('logs') . ' - ');
+		Minz_View::prependTitle (Minz_Translate::t ('logs') . ' · ');
 
 		if (Minz_Request::isPost ()) {
 			FreshRSS_LogDAO::truncate();

+ 2 - 2
app/i18n/en.php

@@ -287,6 +287,6 @@ return array (
 	'Nov'				=> '\N\o\v\e\m\b\e\r',
 	'Dec'				=> '\D\e\c\e\m\b\e\r',
 	// format for date() function, %s allows to indicate month in letter
-	'format_date'			=> '%s dS Y',
-	'format_date_hour'		=> '%s dS Y \a\t H\.i',
+	'format_date'			=> '%s j\<\s\u\p\>S\<\/\s\u\p\> Y',
+	'format_date_hour'		=> '%s j\<\s\u\p\>S\<\/\s\u\p\> Y \a\t H\.i',
 );

+ 2 - 2
app/i18n/fr.php

@@ -287,6 +287,6 @@ return array (
 	'Nov'				=> '\n\o\v\e\m\b\r\e',
 	'Dec'				=> '\d\é\c\e\m\b\r\e',
 	// format pour la fonction date(), %s permet d'indiquer le mois en toutes lettres
-	'format_date'			=> 'd %s Y',
-	'format_date_hour'		=> '\l\e d %s Y \à H\:i',
+	'format_date'			=> 'j %s Y',
+	'format_date_hour'		=> '\l\e j %s Y \à H\:i',
 );

+ 2 - 2
app/i18n/install.en.php

@@ -1,8 +1,8 @@
 <?php
 return array (
-	'freshrss_installation'		=> 'Installation - FreshRSS',
+	'freshrss_installation'		=> 'Installation · FreshRSS',
 	'freshrss'			=> 'FreshRSS',
-	'installation_step'		=> 'Installation - step %d',
+	'installation_step'		=> 'Installation — step %d · FreshRSS',
 	'steps'				=> 'Steps',
 	'checks'			=> 'Checks',
 	'general_configuration'	=> 'General configuration',

+ 2 - 2
app/i18n/install.fr.php

@@ -1,8 +1,8 @@
 <?php
 return array (
-	'freshrss_installation'		=> 'Installation - FreshRSS',
+	'freshrss_installation'		=> 'Installation · FreshRSS',
 	'freshrss'			=> 'FreshRSS',
-	'installation_step'		=> 'Installation - étape %d',
+	'installation_step'		=> 'Installation — étape %d · FreshRSS',
 	'steps'				=> 'Étapes',
 	'checks'			=> 'Vérifications',
 	'general_configuration'	=> 'Configuration générale',

+ 4 - 4
app/views/configure/display.phtml

@@ -24,7 +24,7 @@
 				<select name="theme" id="theme">
 				<?php foreach ($this->themes as $theme) { ?>
 				<option value="<?php echo $theme['path']; ?>"<?php echo $this->conf->theme === $theme['path'] ? ' selected="selected"' : ''; ?>>
-					<?php echo $theme['name'] . ' ' . Minz_Translate::t ('by') . ' ' . $theme['author']; ?> 
+					<?php echo $theme['name'] . ' ' . Minz_Translate::t ('by') . ' ' . $theme['author']; ?> 
 				</option>
 				<?php } ?>
 				</select>
@@ -81,7 +81,7 @@
 				<label class="checkbox" for="auto_load_more">
 					<input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo $this->conf->auto_load_more ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('auto_load_more'); ?>
-					<noscript> - <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<noscript>  <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -91,7 +91,7 @@
 				<label class="checkbox" for="display_posts">
 					<input type="checkbox" name="display_posts" id="display_posts" value="1"<?php echo $this->conf->display_posts ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('display_articles_unfolded'); ?>
-					<noscript> - <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<noscript>  <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -101,7 +101,7 @@
 				<label class="checkbox" for="lazyload">
 					<input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo $this->conf->lazyload ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('img_with_lazyload'); ?>
-					<noscript> - <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<noscript>  <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>

+ 3 - 3
app/views/helpers/view/normal_view.phtml

@@ -43,14 +43,14 @@ if (!empty($this->entries)) {
 	<?php if ($display_today && $item->isDay (FreshRSS_Days::TODAY, $this->today)) { ?>
 	<div class="day" id="day_today">
 		<?php echo Minz_Translate::t ('today'); ?>
-		<span class="date"> - <?php echo timestamptodate (time (), false); ?></span>
+		<span class="date">  <?php echo timestamptodate (time (), false); ?></span>
 		<span class="name"><?php echo $this->currentName; ?></span>
 	</div>
 	<?php $display_today = false; } ?>
 	<?php if ($display_yesterday && $item->isDay (FreshRSS_Days::YESTERDAY, $this->today)) { ?>
 	<div class="day" id="day_yesterday">
 		<?php echo Minz_Translate::t ('yesterday'); ?>
-		<span class="date"> - <?php echo timestamptodate (time () - 86400, false); ?></span>
+		<span class="date">  <?php echo timestamptodate (time () - 86400, false); ?></span>
 		<span class="name"><?php echo $this->currentName; ?></span>
 	</div>
 	<?php $display_yesterday = false; } ?>
@@ -118,7 +118,7 @@ if (!empty($this->entries)) {
 					<?php
 						if ($bottomline_sharing) {
 							$link = urlencode ($item->link ());
-							$title = urlencode ($item->title () . ' - ' . $feed->name ());
+							$title = urlencode ($item->title () . ' · ' . $feed->name ());
 					?>
 					<div class="dropdown">
 						<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>

+ 1 - 1
app/views/helpers/view/reader_view.phtml

@@ -22,7 +22,7 @@ if (!empty($this->entries)) {
 
 				<div class="author">
 					<?php $author = $item->author (); ?>
-					<?php echo $author != '' ? Minz_Translate::t ('by_author', $author) . ' - ' : ''; ?>
+					<?php echo $author != '' ? Minz_Translate::t ('by_author', $author) . '  ' : ''; ?>
 					<?php echo $item->date (); ?>
 				</div>
 

+ 1 - 1
app/views/index/about.phtml

@@ -8,7 +8,7 @@
 		<dd><a href="<?php echo FRESHRSS_WEBSITE; ?>"><?php echo FRESHRSS_WEBSITE; ?></a></dd>
 
 		<dt><?php echo Minz_Translate::t ('lead_developer'); ?></dt>
-		<dd><a href="mailto:contact@marienfressinaud.fr">Marien Fressinaud</a> - <a href="http://marienfressinaud.fr"><?php echo Minz_Translate::t ('website'); ?></a></dd>
+		<dd><a href="mailto:contact@marienfressinaud.fr">Marien Fressinaud</a>  <a href="http://marienfressinaud.fr"><?php echo Minz_Translate::t ('website'); ?></a></dd>
 
 		<dt><?php echo Minz_Translate::t ('bugs_reports'); ?></dt>
 		<dd><?php echo Minz_Translate::t ('github_or_email'); ?></dd>

+ 1 - 1
p/scripts/main.js

@@ -87,7 +87,7 @@ function mark_read(active, only_not_read) {
 		}
 
 		//Update unread: title
-		document.title = document.title.replace(/((?: \(\d+\))?)( - .*?)((?: \(\d+\))?)$/, function (m, p1, p2, p3) {
+		document.title = document.title.replace(/((?: \(\d+\))?)( · .*?)((?: \(\d+\))?)$/, function (m, p1, p2, p3) {
 			return incLabel(p1, inc) + p2 + incLabel(p3, feed_priority > 0 ? inc : 0);
 		});
 	});