Skip to content

Commit

Permalink
FoxTrick -> Foxtrick
Browse files Browse the repository at this point in the history
useless spelling

Remaining files:
- auto generated:
  - res/staff/chpp-holder.json
- contains prefs:
  - defaults/preferences/foxtrick.js
  - content/shortcuts-and-tweaks/extra-shortcuts.js
- localized:
  - content/release-notes.yml
  - content/faq.yml
  - content/foxtrick.properties
  - content/locale/*
  • Loading branch information
minj committed Dec 6, 2015
1 parent 8455a96 commit f401a6d
Show file tree
Hide file tree
Showing 26 changed files with 59 additions and 58 deletions.
4 changes: 2 additions & 2 deletions Info.plist
Expand Up @@ -7,11 +7,11 @@ a good reason to. They are for version bumps in Makefile.
<plist version="1.0">
<dict>
<key>Author</key>
<string>FoxTrick team</string>
<string>Foxtrick team</string>
<key>Builder Version</key>
<string>534.50</string>
<key>CFBundleDisplayName</key>
<string>FoxTrick</string>
<string>Foxtrick</string>
<key>CFBundleIdentifier</key>
<string>www.foxtrick.org</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Expand Up @@ -177,11 +177,11 @@ ifeq ($(DIST_TYPE),nightly)
# add minor version and change name
cd $(BUILD_DIR); \
../version.sh $(REV_VERSION); \
sed -i -r 's|(<em:name>).+(</em:name>)|\1FoxTrick (Beta)\2|' install.rdf;
sed -i -r 's|(<em:name>).+(</em:name>)|\1Foxtrick (Beta)\2|' install.rdf;
else ifeq ($(DIST_TYPE),light)
# change name
cd $(BUILD_DIR); \
sed -i -r 's|(<em:name>).+(</em:name>)|\1FoxTrick (light)\2|' install.rdf
sed -i -r 's|(<em:name>).+(</em:name>)|\1Foxtrick (light)\2|' install.rdf
endif

ifeq ($(DIST_TYPE),hosting)
Expand Down Expand Up @@ -234,11 +234,11 @@ ifeq ($(DIST_TYPE),nightly)
# add minor version and change name
cd $(BUILD_DIR); \
../version.sh $(REV_VERSION); \
sed -i -r 's|("name" : ").+(")|\1FoxTrick (Beta)\2|' manifest.json
sed -i -r 's|("name" : ").+(")|\1Foxtrick (Beta)\2|' manifest.json
else ifeq ($(DIST_TYPE),light)
# change name
cd $(BUILD_DIR); \
sed -i -r 's|("name" : ").+(")|\1FoxTrick (light)\2|' manifest.json
sed -i -r 's|("name" : ").+(")|\1Foxtrick (light)\2|' manifest.json
endif

ifneq ($(DIST_TYPE),hosting)
Expand Down Expand Up @@ -290,11 +290,11 @@ ifeq ($(DIST_TYPE),nightly)
# add minor version and change name
cd $(SAFARI_BUILD_DIR); \
../../version.sh $(REV_VERSION); \
sed -i -r 's/>FoxTrick</>FoxTrick (Beta)</' Info.plist
sed -i -r 's/>Foxtrick</>Foxtrick (Beta)</' Info.plist
else ifeq ($(DIST_TYPE),light)
# change name
cd $(SAFARI_BUILD_DIR); \
sed -i -r 's/>FoxTrick</>FoxTrick (light)</' Info.plist
sed -i -r 's/>Foxtrick</>Foxtrick (light)</' Info.plist
endif

cd $(SAFARI_BUILD_DIR); \
Expand Down
4 changes: 2 additions & 2 deletions Settings.plist
Expand Up @@ -4,7 +4,7 @@
<array>
<dict>
<key>Title</key>
<string>FoxTrick Options</string>
<string>Foxtrick Options</string>
<key>Type</key>
<string>Group</string>
</dict>
Expand All @@ -14,7 +14,7 @@
<key>Key</key>
<string>openFoxtrickOptions</string>
<key>Title</key>
<string>Click me to show FoxTrick's options.</string>
<string>Click me to show Foxtrick options.</string>
<key>Type</key>
<string>CheckBox</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion content/background.js
@@ -1,7 +1,7 @@
'use strict';
/*
* background.js
* FoxTrick background loader for sandboxed arch and fennec
* Foxtrick background loader for sandboxed arch and fennec
* executed on extension load (on activate, reload and browser start)
*/

Expand Down
2 changes: 1 addition & 1 deletion content/bootstrap-fennec.js
Expand Up @@ -141,7 +141,7 @@ function loadIntoWindow(window) {
window.Foxtrick = new FoxtrickFennec(window);
window.Foxtrick.init();
} catch (e) {
Cu.reportError('FoxTrick error: ' + e);
Cu.reportError('Foxtrick error: ' + e);
}
}

Expand Down
20 changes: 10 additions & 10 deletions content/bootstrap-firefox.js
Expand Up @@ -307,8 +307,8 @@ FoxtrickFirefox.prototype = {
this.loadToolbarItem();
}
catch (e) {
dump('FoxTrick error: ToolbarItem failed ' + e + '\n');
Cu.reportError('FoxTrick error: ToolbarItem failed ' + e);
dump('Foxtrick error: ToolbarItem failed ' + e + '\n');
Cu.reportError('Foxtrick error: ToolbarItem failed ' + e);
}
}
},
Expand Down Expand Up @@ -351,8 +351,8 @@ FoxtrickFirefox.prototype = {
this.generalButton = this.ToolbarItem.create(
'<toolbarbutton id="foxtrick-toolbar-button" ' +
'type="menu" ' +
'label="FoxTrick" ' +
'tooltiptext="FoxTrick" ' +
'label="Foxtrick" ' +
'tooltiptext="Foxtrick" ' +
'context="foxtrick-menu" ' +
'class="' + this.ToolbarItem.BASIC_ITEM_CLASS +
' foxtrick-toolbar-item">' +
Expand All @@ -371,8 +371,8 @@ FoxtrickFirefox.prototype = {
);
}
catch (e) {
dump('FoxTrick error: Toolbar button init ' + e + '\n');
Cu.reportError('FoxTrick error: Toolbar button init ' + e);
dump('Foxtrick error: Toolbar button init ' + e + '\n');
Cu.reportError('Foxtrick error: Toolbar button init ' + e);
}
},
loadContextMenu: function() {
Expand All @@ -384,7 +384,7 @@ FoxtrickFirefox.prototype = {
let contextMenuString =
'<menu id="foxtrick-popup-copy" ' +
'class="menu-iconic foxtrick-menu-item" ' +
'label="FoxTrick">' +
'label="Foxtrick">' +
'<menupopup>' +
'<menuitem id="foxtrick-popup-copy-id" ' +
'label="Copy ID"/>' +
Expand All @@ -402,8 +402,8 @@ FoxtrickFirefox.prototype = {
popup.insertBefore(fragment, copyPaste.nextSibling);
}
catch (e) {
dump('FoxTrick error: Context menu init ' + e + '\n');
Cu.reportError('FoxTrick error: Context menu init ' + e);
dump('Foxtrick error: Context menu init ' + e + '\n');
Cu.reportError('Foxtrick error: Context menu init ' + e);
}
},
removeContextMenu: function() {
Expand Down Expand Up @@ -457,7 +457,7 @@ function loadIntoWindow(window) {
window.Foxtrick.init();
}
catch (e) {
let msg = 'FoxTrick error: ' + e + '\n' + e.stack + '\n';
let msg = 'Foxtrick error: ' + e + '\n' + e.stack + '\n';
dump(msg);
Services.console.logStringMessage(msg);
Cu.reportError(msg);
Expand Down
4 changes: 2 additions & 2 deletions content/core.js
@@ -1,7 +1,7 @@
'use strict';
/**
* core.js
* Some core functions for FoxTrick
* Some core functions for Foxtrick
* @author ryanli
*/

Expand Down Expand Up @@ -107,7 +107,7 @@ Foxtrick.modules.Core = {
if (bottom) { // sometimes bottom is not loaded yet. just skip it in those cases
var server = bottom.getElementsByClassName('currentServer')[0];
var span = doc.createElement('span');
span.textContent += ' / FoxTrick ' + Foxtrick.version() + ' ' + Foxtrick.branch();
span.textContent += ' / Foxtrick ' + Foxtrick.version() + ' ' + Foxtrick.branch();
span.id = 'ft_versionInfo';
server.appendChild(span);
}
Expand Down
8 changes: 4 additions & 4 deletions content/entry.js
@@ -1,7 +1,7 @@
'use strict';
/*
* entry.js
* Entry point of FoxTrick modules
* Entry point of Foxtrick modules
* @author ryanli, convincedd
*/

Expand Down Expand Up @@ -49,7 +49,7 @@ Foxtrick.entry.docLoad = function(doc) {
if (!content)
return;

// run FoxTrick modules
// run Foxtrick modules
var begin = (new Date()).getTime();
Foxtrick.entry.run(doc);
var diff = (new Date()).getTime() - begin;
Expand Down Expand Up @@ -107,7 +107,7 @@ Foxtrick.entry.contentScriptInit = function(data) {

// called on browser load and after preferences changes (background side for sandboxed, fennec)
Foxtrick.entry.init = function(reinit) {
// Foxtrick.log('Initializing FoxTrick... reinit:', reinit);
// Foxtrick.log('Initializing Foxtrick... reinit:', reinit);

// add MODULE_NAME to modules
var i;
Expand Down Expand Up @@ -148,7 +148,7 @@ Foxtrick.entry.init = function(reinit) {
return null;
});

Foxtrick.log('FoxTrick initialization completed.');
Foxtrick.log('Foxtrick initialization completed.');
};

Foxtrick.entry.run = function(doc, is_only_css_check) {
Expand Down
2 changes: 1 addition & 1 deletion content/env.js
@@ -1,7 +1,7 @@
'use strict';
/**
* env.js
* FoxTrick environment
* Foxtrick environment
* @author convinced
*/

Expand Down
4 changes: 2 additions & 2 deletions content/forum-stage.js
Expand Up @@ -19,11 +19,11 @@ Foxtrick.modules['ForumStage'] = {
divalert.className = 'alert ft-dummy';
divalert.appendChild(doc.createTextNode('Please '));
var b = divalert.appendChild(doc.createElement('b'));
b.appendChild(doc.createTextNode('disable FoxTrick'));
b.appendChild(doc.createTextNode('disable Foxtrick'));
divalert.appendChild(doc.createTextNode(' and any other Hattrick extensions' +
' before reporting a bug (eg Browser menu -> Tools -> Add-ons). ' +
' Repeated ignorance can lead to getting kicked from stage. ' +
'FoxTrick bugs report '));
'Foxtrick bugs report '));
var a = divalert.appendChild(doc.createElement('a'));
a.appendChild(doc.createTextNode('here'));
a.href = '/Forum/Overview.aspx?v=0&f=173635';
Expand Down
7 changes: 4 additions & 3 deletions content/forum/auto-post-specs.js
Expand Up @@ -40,15 +40,16 @@ Foxtrick.modules['AutoPostSpecs'] = {

//super simple check if the spoiler is already present, but seems sufficient
//applies when editing forum msgs
var matched = txt.match('FoxTrick ' + Foxtrick.version());
if(matched !== null)
var reText = Foxtrick.strToRe('Foxtrick ' + Foxtrick.version());
var RE = new RegExp(reText, 'i');
if (RE.test(txt))
return;

var win = doc.defaultView;

var navInfo = win.navigator.userAgent + ' - ' + win.navigator.platform;

txt = txt + '\n[hr][spoiler]' + 'FoxTrick ' + Foxtrick.version() + ' ' +
txt = txt + '\n[hr][spoiler]' + 'Foxtrick ' + Foxtrick.version() + ' ' +
Foxtrick.branch() + ' - Stage: ' + Foxtrick.isStage(doc) + ' - Skin: ' +
(Foxtrick.util.layout.isStandard(doc) ? 'normal' : 'simple') + ' - ' +
Foxtrick.Prefs.getString('htLanguage') + ' - ' +
Expand Down
2 changes: 1 addition & 1 deletion content/loader-fennec.js
@@ -1,7 +1,7 @@
'use strict';
/*
* loader-fennec.js
* FoxTrick loader for Fennec platform
* Foxtrick loader for Fennec platform
*/


Expand Down
2 changes: 1 addition & 1 deletion content/loader-firefox.js
@@ -1,7 +1,7 @@
'use strict';
/*
* loader-firefox.js
* FoxTrick loader for Firefox/Seamonkey
* Foxtrick loader for Firefox/Seamonkey
*/


Expand Down
2 changes: 1 addition & 1 deletion content/pages.js
@@ -1,7 +1,7 @@
'use strict';
/**
* pages.js
* @author FoxTrick developers
* @author Foxtrick developers
*
* This is a list of Hattrick pages that modules can run on.
* Those values are simply taken from the hattrick URL, so when the current
Expand Down
4 changes: 2 additions & 2 deletions content/preferences.html
Expand Up @@ -6,7 +6,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="icon" type="image/png" href="./resources/img/icon-32.png" />
<link rel="stylesheet" type="text/css" media="screen" href="./resources/css/preferences.css" />
<title>FoxTrick Preferences</title>
<title>Foxtrick Preferences</title>

<!-- essential -->
<script type="application/x-javascript" src="./env.js"></script>
Expand Down Expand Up @@ -473,7 +473,7 @@ <h3 data-text="link.title"></h3>
<div class="module" x-on="about all">
<h3 data-text="about.copyright"></h3>
<div class="module-content">
<h4>FoxTrick - a browser add-on for the Hattrick.org online football manager game</h4>
<h4>Foxtrick - a browser add-on for the Hattrick.org online football manager game</h4>
<ul>
<li>Copyright &copy; 2005&ndash;2008, Karel Kolman &lt;kolmis@gmail.com&gt;</li>
<li>Copyright &copy; 2008&ndash;2009, Mod-PaV</li>
Expand Down
2 changes: 1 addition & 1 deletion content/prefs-util.js
Expand Up @@ -178,7 +178,7 @@ Foxtrick.Prefs = {

// ---------------------- common function --------------------------------------

// returns whether FoxTrick is enabled on doc
// returns whether Foxtrick is enabled on doc
isEnabled: function(doc) {
if (Foxtrick.Prefs.getBool('disableOnStage') && Foxtrick.isStage(doc))
return false;
Expand Down
2 changes: 1 addition & 1 deletion content/read-ht-prefs.js
@@ -1,7 +1,7 @@
'use strict';
/**
* read-ht-prefs.js
* Read Hattrick preferences and change FoxTrick's accordingly.
* Read Hattrick preferences and change Foxtrick's accordingly.
* @author convinced, ryanli
*/

Expand Down
2 changes: 1 addition & 1 deletion content/resources/css/foxtrick.css
Expand Up @@ -257,7 +257,7 @@ span.flag img {
margin: 0;
}

/* FoxTrick note */
/* Foxtrick note */
.ft-note {
background-color: #efefff;
border: 1px solid #2f31ff;
Expand Down
4 changes: 2 additions & 2 deletions content/resources/css/user-content-example.css
@@ -1,6 +1,6 @@
/* user-content-example.css
*
* This file is a list of CSS statements for styling FoxTrick that satisfies
* This file is a list of CSS statements for styling Foxtrick that satisfies
* user's preferences. There are comments (everything with / * ... * / are comments)
* that describes what module each statement belongs to and their meanings.
*
Expand All @@ -11,7 +11,7 @@
* Hattrick rule.
*
* After saving it to a file and adjusting the values, you can use
* the SkinPlugin module of FoxTrick to load the CSS file in order to have the
* the SkinPlugin module of Foxtrick to load the CSS file in order to have the
* user style in effect.
*
* Example basic color names:
Expand Down
6 changes: 3 additions & 3 deletions content/ui.js
Expand Up @@ -112,18 +112,18 @@ if (Foxtrick.platform == 'Firefox') {
var statusText;

if (Foxtrick.Prefs.getBool('disableTemporary')) {
// FoxTrick is disabled temporarily
// Foxtrick is disabled temporarily
button.setAttribute('status', 'disabled');
statusText = Foxtrick.L10n.getString('status.disabled');
}
else if ((Foxtrick.isHt(doc) || /^chrome:\/\/foxtrick/.test(doc.location.href)) &&
!(Foxtrick.Prefs.getBool('disableOnStage') && Foxtrick.isStage(doc))) {
// FoxTrick is enabled, and active on current page
// Foxtrick is enabled, and active on current page
button.setAttribute('status', 'active');
statusText = Foxtrick.L10n.getString('status.active');
}
else {
// FoxTrick is enabled, but not active on current page
// Foxtrick is enabled, but not active on current page
button.setAttribute('status', 'enabled');
var hostname = '';
try {
Expand Down
6 changes: 3 additions & 3 deletions content/util/log.js
Expand Up @@ -17,7 +17,7 @@ Foxtrick.error = function(err) {
};


// outputs a list of strings/objects/errors to FoxTrick log
// outputs a list of strings/objects/errors to Foxtrick log
Foxtrick.log = function() {
if (arguments.length < 2 && typeof arguments[0] === 'undefined')
// useless logging
Expand Down Expand Up @@ -106,9 +106,9 @@ Foxtrick.log = function() {
// goes to JS->Log in the browser console (ctrl+shift+J)
if (Foxtrick.platform == 'Android' && Foxtrick.chromeContext() == 'content')
// logging does not work particularly well in Fennec content
Cu.reportError(new Error('FoxTrick: ' + concated));
Cu.reportError(new Error('Foxtrick: ' + concated));
else
Services.console.logStringMessage('FoxTrick: ' + concated);
Services.console.logStringMessage('Foxtrick: ' + concated);
}
if (typeof dump === 'function' && Foxtrick.Prefs.getBool('dump')) {
// window.dump, a Gecko extension
Expand Down
2 changes: 1 addition & 1 deletion content/util/module.js
@@ -1,7 +1,7 @@
'use strict';
/*
* module.js
* Utilities for FoxTrick categorized module handling
* Utilities for Foxtrick categorized module handling
* @author ryanli
*/

Expand Down
2 changes: 1 addition & 1 deletion content/util/note.js
@@ -1,6 +1,6 @@
'use strict';
/* note.js
* Foxtrick.util.note used for creating FoxTrick notes.
* Foxtrick.util.note used for creating Foxtrick notes.
* @author ryanli
*/
if (!Foxtrick)
Expand Down

0 comments on commit f401a6d

Please sign in to comment.