'); - html.push ('Add Contact'); + html.push ('', _('contactAddLabel'), ''); this.popup = new Dragonfly.AddressBook.ContactPopup(); }; @@ -219,7 +219,7 @@ Dragonfly.AddressBook.ContactPicker.prototype.newContactHandler = function (evt) // The ContactPopup manages the interaction for creating and editing contacts Dragonfly.AddressBook.ContactPopup = function (elem) -{ +{ Dragonfly.PopupBuble.apply (this, arguments); }; @@ -227,14 +227,14 @@ Dragonfly.AddressBook.ContactPopup.prototype = clone (Dragonfly.PopupBuble.proto Dragonfly.AddressBook.ContactPopup.prototype.FieldTypes = { props: ['tel', 'im', 'email', 'url', 'org', 'adr'], - email: {name:'email', label:'Email', prop: 'email', type: 'INTERNET', protocol: 'mailto:'}, - phone: {name:'phone', label:'Phone', prop: 'tel', protocol: 'tel:'}, - fax: {name:'fax', label:'Fax', prop: 'tel', type: 'FAX', protocol: 'tel:'}, - mobile: {name:'mobile', label:'Mobile', prop: 'tel', type: 'CELL', protocol: 'tel:'}, - im: {name:'im', label:'IM', prop: 'im', protocol: 'im:'}, - website: {name:'website', label:'Website', prop: 'url', protocol: 'http:'}, - org: {name:'org', label:'Company', prop: 'org'}, - address: {name:'address', label:'Address', prop: 'adr', longtext:true} + email: {name:'email', label:'contactEmail', prop: 'email', type: 'INTERNET', protocol: 'mailto:'}, + phone: {name:'phone', label:'contactPhone', prop: 'tel', protocol: 'tel:'}, + fax: {name:'fax', label:'contactFax', prop: 'tel', type: 'FAX', protocol: 'tel:'}, + mobile: {name:'mobile', label:'contactMobile', prop: 'tel', type: 'CELL', protocol: 'tel:'}, + im: {name:'im', label:'contactIM', prop: 'im', protocol: 'im:'}, + website: {name:'website', label:'contactWebsite', prop: 'url', protocol: 'http:'}, + org: {name:'org', label:'contactCompany', prop: 'org'}, + address: {name:'address', label:'contactAddress', prop: 'adr', longtext:true} }; Dragonfly.AddressBook.ContactPopup.prototype.Form = [{ @@ -302,9 +302,9 @@ Dragonfly.AddressBook.ContactPopup.prototype.summarize = function (contact, elem var loc = new d.Location ({ tab: 'mail', set:'all', handler:'contacts', contact: contact.bongoId }); html.push ('
'); + '', _('genericDelete'), '', + '', _('contactShowConversations'), '', + '', _('contactEditLabel'), 'Are you sure you want to delete the contact “', - Dragonfly.escapeHTML (this.contact.fn), '”? This cannot be undone.' + '
', _('contactConfirmRemovePre'), '“', + Dragonfly.escapeHTML (this.contact.fn), '”', _('contactConfirmRemovePost'), '
' ]; - var actions = [{ value: "Cancel", onclick: 'dispose'}, { value: "Delete", onclick: 'del'}]; + var actions = [{ value: _('genericCancel'), onclick: 'dispose'}, { value: _('genericDelete'), onclick: 'del'}]; this.setForm (text, actions); this.show(); }; diff --git a/src/www/js/BongoCalendar.js b/src/www/js/BongoCalendar.js index 6742239..f41960f 100644 --- a/src/www/js/BongoCalendar.js +++ b/src/www/js/BongoCalendar.js @@ -92,7 +92,7 @@ Dragonfly.Calendar.BongoCalendar.prototype.parseJSON = function (jsob) this.type = 'personal'; } - this.subscriptionUrl = "/user/ " + d.userName + "/calendar/" + d.escapeHTML(this.cal.name) + "/events"; + this.subscriptionUrl = "/user/" + d.userName + "/calendar/" + d.escapeHTML(this.cal.name) + "/events"; /* // this should probably trust the server... diff --git a/src/www/js/Calendar.js b/src/www/js/Calendar.js index 06edadd..c80e191 100644 --- a/src/www/js/Calendar.js +++ b/src/www/js/Calendar.js @@ -343,13 +343,13 @@ Dragonfly.Calendar.Events.build = function (loc) Element.setHTML ( 'toolbar', [ '', - 'Day', + '', _('day'), '', '', - 'Upcoming', + '', _('upcoming'), '', '', - 'Week', + '', _('week'), '', '', - 'Month' + '', _('month'), '' ]); Element.show ('toolbar'); } else { diff --git a/src/www/js/CalendarEditor.js b/src/www/js/CalendarEditor.js index 3330f7e..fbbe959 100644 --- a/src/www/js/CalendarEditor.js +++ b/src/www/js/CalendarEditor.js @@ -11,7 +11,7 @@ Dragonfly.Calendar.PersonalProperties = function (parent, calendar, showImport) this.colorId = this.color.id; // sharing bits - this.disclosure = new d.DisclosingLink (null, 'Share this calendar'); + this.disclosure = new d.DisclosingLink (null, _('shareCalendar')); this.publishId = this.disclosure.checkId; this.nb = new d.Notebook(); @@ -805,7 +805,7 @@ Dragonfly.Calendar.NewSubscriptionPopup.prototype.buildHtml = function (html) Dragonfly.PopupBuble.prototype.buildHtml.call ( this, html, ''); @@ -910,9 +910,9 @@ Dragonfly.Calendar.CalendarPropsPopup.prototype.edit = function () this.saveId = d.nextId ('calendar-save'); html.push (' Prev | ',
+ '', _('genericPreviousShort'), ' | ',
'', d.escapeHTML (title), ' | ',
- 'Next | ',
+ '', _('genericNext'), ' | ',
'
Prev';
+ var prev = '' + _('genericPreviousShort') + '';
tmpLoc.day = reldays.next;
- var next = 'Next';
+ var next = '' + _('genericNext') + '';
var html = new d.HtmlBuilder ('| ', this.day.format ('y'), ' | ', '→ | ', '|||||
|---|---|---|---|---|---|---|
| S | M | T | W | T | F | S |
| ', _('sunday-s'), + ' | ', _('monday-s'), + ' | ', _('tuesday-s'), + ' | ', _('wednesday-s'), + ' | ', _('thursday-s'), + ' | ', _('friday-s'), + ' | ', _('saturday-s'), + ' |
', - 'view in calendar' + '', _('viewInCal'), '' ); w.popup.showBelow (); d.requestJSON ('GET', loc).addCallback (function (jsob) { calwidget.layout (jsob); }); diff --git a/src/www/js/Dragonfly.js b/src/www/js/Dragonfly.js index 2cab1e1..8efc2ca 100644 --- a/src/www/js/Dragonfly.js +++ b/src/www/js/Dragonfly.js @@ -813,7 +813,7 @@ Dragonfly.buildSidebar = function () html.set (d.sideBook.appendPage (IMG({ 'class': 'icon calendars', src: '/img/blank.gif' }))); // todo tab of sidebook - // d.sideBook.appendPage (DIV(), IMG({ 'class': 'icon todos', src: '/img/blank.gif' })); + //d.sideBook.appendPage (DIV(), IMG({ 'class': 'icon todos', src: '/img/blank.gif' })); d.HtmlBuilder.buildChild ('sidebox-sidebook', d.sideBook); }; @@ -887,13 +887,41 @@ Dragonfly.observeEvents = function () d.sidebarSelectChanged.bindAsEventListener (null)); }; +Dragonfly.translateElements = function () +{ + // Top bar + Element.setHTML ('admin-text', _('administrationLabel')); + Element.setHTML ('logout-text', _('logoutLabel')); + Element.setHTML ('settings-text', _('preferencesLabel')); + $('bongosearch').value = _('searchButtonLabel'); + Element.setHTML ('sidebar-select-search', _('searchButtonLabel')); + + // Sidebar + Element.setHTML ('summary-tab-label', _('summaryTabLabel')); + Element.setHTML ('summary-tab-label-alt', _('summaryTabLabel')); + document.getElementById('summary-tab-href').title = _('summaryTabHint'); + + Element.setHTML ('mail-tab-label', _('mailTabLabel')); + Element.setHTML ('mail-tab-label-alt', _('mailTabLabel')); + document.getElementById('mail-tab-href').title = _('mailTabHint'); + Element.setHTML ('compose-tab', _('composeMailLabel')); + + Element.setHTML ('calendar-tab-label', _('calendarTabLabel')); + Element.setHTML ('calendar-tab-label-alt', _('calendarTabLabel')); + document.getElementById('calendar-tab-href').title = _('calendarTabHint'); + Element.setHTML ('new-event-href', _('composeEventLabel')); +} + Dragonfly.start = function () { var d = Dragonfly; var p = d.Preferences; var c = d.Calendar; + + d.buildSidebar(); + d.translateElements(); - d.setLoginMessage ('Logged in: loading contacts and calendars...'); + d.setLoginMessage (_('loadingData')); // set current timezone to default and build timezone selector d.curTzid = c.Preferences.getDefaultTimezone(); @@ -905,7 +933,7 @@ Dragonfly.start = function () return def.addCallbacks ( function (res) { var loc = new d.Location (location.hash); - d.setLoginMessage ('Logged in: loading ' + d.escapeHTML (loc.tab) + '...'); + d.setLoginMessage (_('loadingItemPre') + d.escapeHTML (loc.tab) + _('loadingItemPost')); return d.go (loc.user == d.userName ? loc : '#').addErrback ( function (err) { logDebug ('got error on first try:', d.reprError (err), '; trying summary...'); @@ -990,7 +1018,7 @@ Dragonfly.main = function () { Dragonfly.browserDetect(); Dragonfly.initHtmlZones(); - Dragonfly.buildSidebar(); + //Dragonfly.buildSidebar(); Dragonfly.observeLoginEvents (); Dragonfly.login(); }; diff --git a/src/www/js/Login.js b/src/www/js/Login.js index 5b736b6..bbcbbb2 100644 --- a/src/www/js/Login.js +++ b/src/www/js/Login.js @@ -44,7 +44,7 @@ Dragonfly.login = function (user) d.authToken = btoa (user + ':'); } - d.setLoginMessage ('Attempting to log in...'); + d.setLoginMessage (_('loggingInMessage')); d.setLoginDisabled (true); p.load().addCallbacks ( @@ -56,9 +56,9 @@ Dragonfly.login = function (user) d.setLoginMessage (' '); d.showLoginPane(); } else if (err.req) { - d.setLoginMessage ('Incorrect user or password'); + d.setLoginMessage (_('wrongCredentials')); } else { - d.setLoginMessage ('Error logging in (check Logs)'); + d.setLoginMessage (_('genericLoginError')); logError ('login error: ' + d.reprError (err)); } d.setLoginDisabled (false); @@ -90,13 +90,15 @@ Dragonfly.logout = function () } }; -Dragonfly.translateLoginPage = function () +Dragonfly.translateLogin = function () { + // Login screen Element.setHTML ('login-user-label', _('loginNameLabel')); Element.setHTML ('login-password-label', _('loginPasswordLabel')); Element.setHTML ('login-language-label', _('loginLanguageLabel')); Element.setHTML ('login-default-label', _('loginRememberMeLabel')); $('login-button').value = _('loginLoginLabel'); + Dragonfly.logoutMessage = _('loggedOutMessage'); }; Dragonfly.languageChanged = function (evt) @@ -104,12 +106,12 @@ Dragonfly.languageChanged = function (evt) var d = Dragonfly; var g = d.Gettext; - d.setLoginMessage ('Loading language...'); + //d.setLoginMessage ('Loading language...'); d.setLoginDisabled (true); g.setLocale (null, $('login-language').value).addCallbacks ( function (res) { - d.setLoginMessage (' '); - d.translateLoginPage (); + //d.setLoginMessage (' '); + d.translateLogin (); d.setLoginDisabled (false); return res; }, @@ -154,7 +156,7 @@ Dragonfly.showLoginPane = function () addElementClass (document.body, 'login'); if (location.hash == '#LoggedOut') { - Dragonfly.setLoginMessage ('You have successfully logged out'); + Dragonfly.setLoginMessage (Dragonfly.logoutMessage); location.hash = (Dragonfly.isWebkit) ? '' : '#'; $('login-user').focus(); } else { diff --git a/src/www/js/Search.js b/src/www/js/Search.js index 8340be4..738a43c 100644 --- a/src/www/js/Search.js +++ b/src/www/js/Search.js @@ -117,7 +117,7 @@ Dragonfly.Search.Contacts.connectHtml = function (elem) Event.observe ('contacts-search-results', 'click', (function (evt) { var elem = Event.element (evt); - var card = d.findElement (elem, 'DIV', $('contacts-search')); + var card = d.findElement (elem, 'TABLE', $('contacts-search')); var bongoId = card && card.getAttribute ('bongoid'); if (!bongoId) { return; diff --git a/src/www/js/Summary.js b/src/www/js/Summary.js index 9cfc5b0..b7a7f91 100644 --- a/src/www/js/Summary.js +++ b/src/www/js/Summary.js @@ -40,31 +40,34 @@ Dragonfly.Summary.build = function (loc) '
An error occurred:
', + '
', _('genericError'), '
', err.message, '
Desktop
Users
Agents
System
Help
Desktop
Users
Agents
System
Help