Commit acb85558 authored by Troy A. Griffitts's avatar Troy A. Griffitts

Fixed footnotes button. More i18n.

parent cf2d1b12
#PLATFORM=ios
PLATFORM=android
APP_VERSION=$(shell grep 'change version here' www/js/bishop.js |cut -f2 -d\')
ADB=/usr/bin/adb
all: release
......@@ -56,7 +57,7 @@ deploy: deploy${PLATFORM}
installandroid:
adb install -r bishop.apk
$(ADB) install -r bishop.apk
deployandroid:
scp bishop.apk scribe@crosswire.org:/home/crosswire/html/
......@@ -71,7 +72,7 @@ deployios:
uninstall: uninstall${PLATFORM}
uninstallandroid:
adb uninstall org.crosswire.bishop
$(ADB) uninstall org.crosswire.bishop
uninstallios:
echo uninstall app from iphone
......
<?xml version='1.0' encoding='utf-8'?>
<widget id="org.crosswire.bishop" version="1.4.0" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<widget id="org.crosswire.bishop" version="1.4.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<name>Bishop</name>
<description>
A Bible Study App from CrossWire
......
......@@ -165,8 +165,8 @@ Brown Dark=Brown Dark
Brown Light=Brown Light
Stone Blue Dark=Stone Blue Dark
Stone Blue Light=Stone Blue Light
with any morphology in=with any morphology in
Show all occurrences of=Show all occurrences of
with any morphology in=with any morphology in
# These next 2 are for search strings like: Searching for God love world in KJV
Searching for=Searching for
in=in
......
......@@ -14,7 +14,6 @@ Bookmarks=Lesezeichen
Search=Suche
BibleSync=BibleSync
Library=Sammlung
Toggle Footnotes=Anmerkungen ein/ausschalten
Settings=Einstellungen
About=Info
Bishop is a Bible study application from The CrossWire Bible Society and is a member of The SWORD Project family of Bible study tools.=Bishop ist eine Anwendung zum Bibelstudium von der CrossWire Bibelgesellschaft und ein Teil der Familie von SWORD Projekt Lernwerkzeuge zum Bibelstudium.
......@@ -93,3 +92,60 @@ Unlock Key:=Freischaltungscode:
Unlock key for=Freischaltungscode für
Install=Installieren
If you do not yet have an unlock key, you can still install this module now and provide the key later using the 'About' screen of this application.=Wenn Sie noch nicht einen Freischaltungscode erhalten haben, können Sie noch diese Komponente installieren und den Code später auf der About-Seite dieser App eingeben.
Toggle Footnotes=Anmerkungen ein/ausschalten
Daily Devotion=Daily Devotion
Daily devotionals can be installed from the "Library" choice in the side menu.=Daily devotionals can be installed from the "Library" choice in the side menu.
Select a module source, .e.g., "CrossWire", and then choose type "Daily Devotionals".=Select a module source, .e.g., "CrossWire", and then choose type "Daily Devotionals".
previous day=previous day
next day=next day
Total Results:=Total Results:
Refresh=Refresh
We would suggest installing from "CrossWire" the KJV, WLC, WHNU, StrongsGreek, and StrongsHebrew modules for a minimal set of modules which allow basic Greek and Hebrew word study.=We would suggest installing from "CrossWire" the KJV, WLC, WHNU, StrongsGreek, and StrongsHebrew modules for a minimal set of modules which allow basic Greek and Hebrew word study.
I can do all of this for you now, if you would like; simply press this button:=I can do all of this for you now, if you would like; simply press this button:
Basic Module Set=Basic Module Set
Cults / Unorthodox / Questionable Material=Cults / Unorthodox / Questionable Material
Word Study requires a Bible with Strongs numbers. Please install one.=Word Study requires a Bible with Strongs numbers. Please install one.
Word Study requires a Greek and Hebrew Strongs dictionary. Please install one of each.=Word Study requires a Greek and Hebrew Strongs dictionary. Please install one of each.
Show Gospel Parallels=Show Gospel Parallels
# This option is used as a choice for Study Bible to use for Verse Study, Word Study, etc.
# First Active means that the first Bible selected in the 3 display dropdowns which has language data will be used.
# This choice says, "I don't wish to choose a specific Bible, just use the first one I am currently diplaying which has the ability."
First Active=First Active
Nothing to display.=Nothing to display.
No Modules Installed=No Modules Installed
No Modules Available. Try pressing the [↻] button.=No Modules Available. Try pressing the [↻] button.
You have received an application update since your last run.=You have received an application update since your last run.
Would you like to check for updates to your Bibles and other study resources?=Would you like to check for updates to your Bibles and other study resources?
Update Resources=Update Resources
Installation Sources=Installation Sources
Updates Available=Updates Available
No installed resources have updates available. New study resources can be added by first selecting an installation source at the top.=No installed resources have updates available. New study resources can be added by first selecting an installation source at the top.
Below is a list of installed resources which have updates available. Click on any row to update the resource.=Below is a list of installed resources which have updates available. Click on any row to update the resource.
You have asked to show Gospel parallels. For this feature, we need to download a small set of data. Is this OK?=You have asked to show Gospel parallels. For this feature, we need to download a small set of data. Is this OK?
Install Module=Install Module
Font: Reading=Font: Reading
Font: App=Font: App
Theme=Theme
Light=Light
Dark=Dark
Brown Dark=Brown Dark
Brown Light=Brown Light
Stone Blue Dark=Stone Blue Dark
Stone Blue Light=Stone Blue Light
Show all occurrences of=Zeige alle Vorkommen von
with any morphology in=mit einer beliebigen Morphologie in
# These next 2 are for search strings like: Searching for God love world in KJV
Searching for=Suchen nach:
in=im
# These next 2 are for search strings like:
# No results found.
# 27 results found.
No=Keine
results found.=Ergebnisse gefunden.
Connecting to server.=Verbindung zum Server herstellen.
# These next 2 are for installing modules with strings like: Downloading 3 of 4
Downloading=Herunterladen
of=von
Total Progress:=Gesamtfortschritt:
......@@ -70,7 +70,8 @@ console.log('using localFixup instead of real SWORD plugin');
setDefaultLocale : function(x, callback) { callback(); }
},
installMgr : {
getRemoteSources : function(callback) { if(callback)callback(['CrossWire']); return ['CrossWire']; }
getRemoteSources : function(callback) { if(callback)callback(['CrossWire']); return ['CrossWire']; },
setUserDisclaimerConfirmed : function(callback) { return (callback) ? callback() : false; }
}
};
MobileAccessibility = {
......@@ -240,7 +241,7 @@ console.log('**** mod doesn\'t exist: ' + mods[i]);
}
}
}, false);
if (window.plugins.intent) {
if (window && window.plugins && window.plugins.intent) {
window.plugins.intent.setNewIntentHandler(function(intent) {
app.handleIntent(intent);
});
......@@ -311,7 +312,7 @@ console.log("*** in show. main.length: " + main.length);
t += '<div class="topBarBandItem" style="width:3.8em;padding-right:.2em;">&nbsp;</div>';
t += '<div class="topBarBandItem" id="keyDisplay" onclick="app.closeMenu();app.closeTopBar(); app.selectKey(); return false;">&nbsp;</div>';
t += '<div class="topBarBandItem" style="padding-top:.35em;" onclick="app.shareVerse(); return false;"><img style="height:2.3em;opacity:0.80;" src="img/ic_action_share.png"/></div>';
t += '<div class="topBarBandItem" style="color:white;font-size: 200%;" class="notesButton">✎</div>';
t += '<div class="topBarBandItem notesButton" style="color:white;font-size: 200%;">✎</div>';
t += '</div>';
t += '<input type="checkbox" class="openSidebarMenu" id="openSidebarMenu">';
t += '<label for="openSidebarMenu" class="sidebarIconToggle">';
......@@ -1093,14 +1094,20 @@ console.log('************ received ' + locales.length + ' locales.');
}
SWORD.mgr.translate(locales[i], 'locales', function(lt) {
SWORD.mgr.translate(locales[i]+'.en', 'locales', function(lten) {
if (lt == locales[i] && lten != (lt+'.en')) lt = lten;
if (lt && lt != locales[i]) {
appLocaleOptions += '<option value="'+locales[i]+'">' + lt + ' (' + locales[i] + ')</option>';
}
else {
appLocaleOptions += '<option>' + locales[i] + '</option>';
}
buildLocaleNames(++i, callback);
SWORD.mgr.translate(locales[i]+'.'+app.getAppLocale(), 'locales', function(ltcur) {
// prefer: native language
// if native language name doesn't exist see if we have one in our language
if (lt == locales[i] && ltcur != (lt+'.'+app.getAppLocale())) lt = ltcur;
// if still no language name exists see if we have one in English
if (lt == locales[i] && lten != (lt+'.en')) lt = lten;
if (lt && lt != locales[i]) {
appLocaleOptions += '<option value="'+locales[i]+'">' + lt + ' (' + locales[i] + ')</option>';
}
else {
appLocaleOptions += '<option>' + locales[i] + '</option>';
}
buildLocaleNames(++i, callback);
});
});
});
};
......@@ -1759,6 +1766,7 @@ console.log('parDispModules.length: ' + parDispModules.length);
var t = '<div id="paralleldisplay">';
t += '<br/>';
t += '<br/>';
t += '<br/>';
t += '<ul class="booknav">';
t += '<li><a href="javascript:void(0);" onclick="app.setCurrentKey(\''+prevChapterString+'\', function() { app.displayCurrentChapter(); }); return false;"><span data-english="previous chapter" style="white-space:nowrap">previous chapter</span></a></li>';
t += ' <li><a href="javascript:void(0);" onclick="app.setCurrentKey(\''+nextChapterString+'\', function() { app.displayCurrentChapter(); }); return false;"><span data-english="next chapter" style="white-space:nowrap">next chapter</span></a></li>';
......
......@@ -54,15 +54,21 @@ var installMgr = {
lastLang = modInfoList[i].language;
SWORD.mgr.translate(lastLang, 'locales', function(lt) {
SWORD.mgr.translate(lastLang+'.en', 'locales', function(lten) {
if (lt == lastLang && lten != (lt+'.en')) lt = lten;
var dispLang = (lt && lt != lastLang) ? (lt + ' (' + lastLang + ')') : lastLang;
SWORD.mgr.translate(lastLang+'.'+app.getAppLocale(), 'locales', function(ltcur) {
// priority: lookup language name in our currently selected locale
if (ltcur != (lastLang+'.'+app.getAppLocale())) lt = ltcur;
// if neither a translation of the language name in our locale, nor a native entry exist, see if .en exists
if (lt == lastLang && lten != (lt+'.en')) lt = lten;
h += '<tr class="langhead">';
h += '<th colspan="' + ((details) ? '3' : '2') + '">';
h += dispLang + '</th>';
count = 0;
// don't increment
return modInfoLoop(i, callback);
var dispLang = (lt && lt != lastLang) ? (lt + ' (' + lastLang + ')') : lastLang;
h += '<tr class="langhead">';
h += '<th colspan="' + ((details) ? '3' : '2') + '">';
h += dispLang + '</th>';
count = 0;
// don't increment
return modInfoLoop(i, callback);
});
});
});
return;
......@@ -170,7 +176,7 @@ var installMgr = {
var buffer ='';
buffer += '<div style="margin: 0pt; padding: 0pt; width: 100%; white-space: nowrap; text-align: center; position: relative; z-index:0;">';
buffer += '&nbsp;<span data-english="'+text+'">' + text + '</span>';
buffer += '&nbsp;' + text;
if (percent > 0) { // for stupid ie
buffer += '<div style="position: absolute; top:0px; left:0px; margin: 0pt; padding: 0pt; background: transparent url(img/statusbar_green.gif) repeat-x scroll 0% 0%; overflow: visible; width: ' + percent + '%; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; vertical-align: middle; filter:alpha(opacity=40); -khtml-opacity: 0.40; -moz-opacity: 0.40; opacity:0.40; z-index:-1;">';
......@@ -204,30 +210,36 @@ console.log('**** installMgr.installModule. disclaimer accepted. installing modu
var lastMessage = '';
var totalBytes = 0;
var completedBytes = 0;
$('#status').html(installMgr.getProgressHTML('Connecting to server.', 0));
app.setAppLocale();
SWORD.installMgr.remoteInstallModule(modSource, modName, function(e) {
if (e.status == "preStatus") {
lastMessage = e.message;
lastMessage = lastMessage.replace(/Downloading/g, '<span data-english="Downloading">Downloading</span>');
lastMessage = lastMessage.replace(/ of /g, ' <span data-english="of">of</span> ');
totalBytes = e.totalBytes;
completedBytes = e.completedBytes;
$('#status').html(installMgr.getProgressHTML(lastMessage', 0));
app.setAppLocale();
}
else if (e.status == "update") {
var percent = (e.completedBytes/e.totalBytes * 100).toFixed(2);
$('#status').html(installMgr.getProgressHTML(lastMessage + ' (' + percent + '%)', percent));
percent = ((completedBytes + e.completedBytes)/totalBytes * 100).toFixed(2);
$('#totalProgress').html(installMgr.getProgressHTML('<span data-english="Total Progress:">Total Progress:</span> ' + percent + '%', percent));
app.setAppLocale();
}
else if (e.status == "complete") {
// only refesh source list if no subsequent processing callback
if (callback) callback();
else installMgr.modSourceChanged();
}
$('#status').html(installMgr.getProgressHTML('<span data-english="Connecting to server.">Connecting to server.</span>', 0));
app.setAppLocale(false, function() {
SWORD.mgr.translate('Downloading', function(transDownloading) {
SWORD.mgr.translate('of', function(transOf) {
SWORD.mgr.translate('Total Progress:', function(transTotalProgress) {
SWORD.installMgr.remoteInstallModule(modSource, modName, function(e) {
if (e.status == "preStatus") {
lastMessage = e.message;
lastMessage = lastMessage.replace(/Downloading/g, transDownloading);
lastMessage = lastMessage.replace(/ of /g, ' '+transOf+' ');
console.log('DOWNLOADING: lastMessage: ' + lastMessage);
totalBytes = e.totalBytes;
completedBytes = e.completedBytes;
$('#status').html(installMgr.getProgressHTML(lastMessage, 0));
}
else if (e.status == "update") {
var percent = (e.completedBytes/e.totalBytes * 100).toFixed(2);
$('#status').html(installMgr.getProgressHTML(lastMessage + ' (' + percent + '%)', percent));
percent = ((completedBytes + e.completedBytes)/totalBytes * 100).toFixed(2);
$('#totalProgress').html(installMgr.getProgressHTML(transTotalProgress + ' ' + percent + '%', percent));
}
else if (e.status == "complete") {
// only refesh source list if no subsequent processing callback
if (callback) callback();
else installMgr.modSourceChanged();
}
});
});
});
});
});
}, 100);
},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment