diff options
| -rwxr-xr-x | Makefile | 4 | ||||
| -rw-r--r-- | changes/feature-4374_fix-items-from-review | 1 | ||||
| -rw-r--r-- | chrome/content/accountWizard/accountWizard.js | 4 | ||||
| -rw-r--r-- | chrome/content/accountWizard/accountWizard.xul | 6 | ||||
| -rw-r--r-- | install.rdf.template | 1 |
5 files changed, 8 insertions, 8 deletions
@@ -41,14 +41,18 @@ all: clean $(TARGET) $(TARGET): clean install.rdf mkdir -p $(TEMPDIR) + mkdir -p `dirname $@` cp -r $(PREFIX)/{$(FILES_TO_PACKAGE)} $(TEMPDIR)/ + rm -rf $(TEMPDIR)/.gitignore (cd $(TEMPDIR) && zip -r $(TARGET) ./) rm -rf $(TEMPDIR) (cd build/ && sha512sum $(PKGNAME) > SHA512SUMS && gpg -a --default-key $(DEFAULTKEY) --detach-sign SHA512SUMS) signed: clean mkdir -p $(TEMPDIR) + mkdir -p `dirname $@` cp -r $(PREFIX)/{$(FILES_TO_PACKAGE)} $(TEMPDIR)/ + rm -rf $(TEMPDIR)/.gitignore signtool -d $(CERTDIR) -k $(CERTNAME) $(TEMPDIR)/ (cd $(TEMPDIR) && zip $(TARGET) ./$(RSA_FILE) && zip -r -D $(TARGET) ./ -x ./$(RSA_FILE)) rm -rf $(TEMPDIR) diff --git a/changes/feature-4374_fix-items-from-review b/changes/feature-4374_fix-items-from-review new file mode 100644 index 0000000..6c4b3bf --- /dev/null +++ b/changes/feature-4374_fix-items-from-review @@ -0,0 +1 @@ + o Fix items from Mozilla editors review. Closes #4374. diff --git a/chrome/content/accountWizard/accountWizard.js b/chrome/content/accountWizard/accountWizard.js index b2b533f..da49536 100644 --- a/chrome/content/accountWizard/accountWizard.js +++ b/chrome/content/accountWizard/accountWizard.js @@ -28,7 +28,6 @@ Cu.import("resource:///modules/gloda/log4moz.js"); let gEmailWizardLogger = Log4Moz.getConfiguredLogger("mail.wizard"); var gStringsBundle; -var gMessengerBundle; var gBrandShortName; function e(elementID) @@ -125,8 +124,7 @@ BitmaskAccountWizard.prototype = gEmailWizardLogger.info("Email account setup dialog loaded."); - gStringsBundle = e("strings"); - gMessengerBundle = e("bundle_messenger"); + gStringsBundle = e("accountCreationStrings"); gBrandShortName = e("bundle_brand").getString("brandShortName"); // admin-locked prefs hurray diff --git a/chrome/content/accountWizard/accountWizard.xul b/chrome/content/accountWizard/accountWizard.xul index 0d42c0d..f9ff6f4 100644 --- a/chrome/content/accountWizard/accountWizard.xul +++ b/chrome/content/accountWizard/accountWizard.xul @@ -31,12 +31,8 @@ <stringbundleset> <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/> - <stringbundle id="strings" + <stringbundle id="accountCreationStrings" src="chrome://messenger/locale/accountCreation.properties"/> - <stringbundle id="utilstrings" - src="chrome://messenger/locale/accountCreationUtil.properties"/> - <stringbundle id="bundle_messenger" - src="chrome://messenger/locale/messenger.properties"/> </stringbundleset> <script type="application/javascript" src="chrome://bitmask/content/serverConfig.js"/> diff --git a/install.rdf.template b/install.rdf.template index 902245f..e447a3e 100644 --- a/install.rdf.template +++ b/install.rdf.template @@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <em:name>Bitmask Thunderbird Extension</em:name> <em:version>__VERSION__</em:version> <em:creator>LEAP developers</em:creator> + <em:type>2</em:type> <!-- type=extension --> <em:targetApplication> <Description> |