Permalink
Browse files

Merge pull request #19 from champo/master

Fix issue #7, contribute to #3
  • Loading branch information...
2 parents 14b11f8 + 78beb92 commit 081a567988b4723e0e6cd902d9a4599677d7ca8b @aceat64 committed Dec 13, 2011
Showing with 8 additions and 6 deletions.
  1. +3 −1 src/i18n.js
  2. +5 −5 src/popup.js
View
@@ -695,11 +695,13 @@ languages["es"] = {
"fullLinkTitle" : "Mostrar mensaje completo",
"refreshLinkTitle" : "Consultar nuevos correos",
"optionsLinkTitle" : "Ir a la página de opciones",
+ "sendPageLinkTitle" : "Enviar link a pagina",
"composeLinkTitle" : "Redactar nuevo correo",
"noUnreadText" : "No tienes correos sin leer",
"oneUnreadText" : "correo sin leer", // One unread item: "1 unread mail"
"severalUnreadText" : "correos sin leer", // Several unread items: "3 unread mail"
- "popupText" : "Has recibido un nuevo correo!"
+ "popupText" : "Has recibido un nuevo correo!",
+ "showLabelsTitle" : "Mostrar etiquetas"
};
// Swedish
View
@@ -179,10 +179,6 @@ function sendReply(mailid) {
function getThread(accountId, mailid) {
- if (Settings.read("showfull_read")) {
- readThread(accountId, mailid, true);
- }
-
if (mailCache[mailid] != null) {
// Mail already fetched, read from cache instead
showBody(accountId, mailid, mailCache[mailid]);
@@ -202,6 +198,10 @@ function showBody(accountid, mailid, mailbody) {
if (mailbody != null) {
+ if (Settings.read("showfull_read")) {
+ readThread(accountid, mailid, true);
+ }
+
var previousMail = null;
var nextMail = null;
var currentMail = allMailMap[mailid];
@@ -590,4 +590,4 @@ $(document).ready(function () {
// Should probably use jQuery for this
document.getElementById('refresh').setAttribute('title', i18n.get('refreshLinkTitle'));
document.getElementById('options').setAttribute('title', i18n.get('optionsLinkTitle'));
-});
+});

0 comments on commit 081a567

Please sign in to comment.