Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

renamed fc/nls/templates to fc/nls/ui, and merged fc/nls/misc into it.

  • Loading branch information...
commit 045f73a39d078999b4bd9f5817344a99db2cb13a 1 parent fc1d50a
@toolness authored
View
17 js/fc/nls/misc.js
@@ -1,17 +0,0 @@
-"use strict";
-
-define({
- description: 'Miscellaneous strings.',
- root: {
- "page-load-err": 'Sorry, an error occurred while trying to get the page.',
- "publish-err": 'Sorry, an error occurred while trying to publish.',
- "facebook-locale": "en_US",
- "default-tweet": "Check out the #MozThimble page I just made:",
- "tweet": "Tweet"
- },
- metadata: {
- "facebook-locale": {
- help: "Locale passed to Facebook for social media actions."
- }
- }
-});
View
21 js/fc/nls/templates.js → js/fc/nls/ui.js
@@ -1,7 +1,16 @@
+"use strict";
+
define([
"inline-l10n"
], function(InlineL10n) {
- var root = {};
+ var root = {
+ "page-load-err": 'Sorry, an error occurred while trying to get the page.',
+ "publish-err": 'Sorry, an error occurred while trying to publish.',
+ "facebook-locale": "en_US",
+ "default-tweet": "Check out the #MozThimble page I just made:",
+ "tweet": "Tweet"
+ };
+
if (typeof(document) == "undefined") {
// We're running in node. Parse all inline l10n strings out
// of all templates.
@@ -17,8 +26,14 @@ define([
}
});
}
+
return {
- description: "Strings for the UI defined in template files.",
- root: root
+ description: "Strings for the user interface.",
+ root: root,
+ metadata: {
+ "facebook-locale": {
+ help: "Locale passed to Facebook for social media actions."
+ }
+ }
};
});
View
2  js/fc/ui/publish.js
@@ -2,7 +2,7 @@
define(function (require) {
var $ = require("jquery"),
- i18nBundle = require("i18n!fc/nls/misc"),
+ i18nBundle = require("i18n!fc/nls/ui"),
BackboneEvents = require("backbone-events"),
SocialMedia = require("./social-media"),
ConfirmDialogTemplate = require("template!confirm-dialog"),
View
2  js/fc/ui/social-media.js
@@ -6,7 +6,7 @@
* they click the like button and we don't like that kind of
* monitoring behaviour.
*/
-define(["i18n!fc/nls/misc"], function(i18nBundle) {
+define(["i18n!fc/nls/ui"], function(i18nBundle) {
return function SocialMedia() {
var urlPlaceHolder = "__URL__PLACE__HOLDER__";
View
2  js/friendlycode.js
@@ -1,6 +1,6 @@
define(function(require) {
var $ = require("jquery"),
- i18nBundle = require("i18n!fc/nls/misc"),
+ i18nBundle = require("i18n!fc/nls/ui"),
Preferences = require("fc/prefs"),
Editor = require("fc/ui/editor"),
Modals = require("fc/ui/modals"),
View
4 js/require-plugins/template.js
@@ -4,7 +4,7 @@ define([
"text",
"underscore",
"inline-l10n",
- "i18n!fc/nls/templates"
+ "i18n!fc/nls/ui"
], function (module, text, _, InlineL10n, i18nBundle) {
var buildMap = {},
masterConfig = module.config();
@@ -29,7 +29,7 @@ define([
if (buildMap[moduleName]) {
var content = buildMap[moduleName];
write.asModule(pluginName + "!" + moduleName,
- "define(['underscore', 'inline-l10n', 'i18n!fc/nls/templates'], " +
+ "define(['underscore', 'inline-l10n', 'i18n!fc/nls/ui'], " +
"function (_, InlineL10n, i18nBundle) { \n return " + content +
";});\n");
}
Please sign in to comment.
Something went wrong with that request. Please try again.