Permalink
Browse files

v6.7.3. Fix. Improvement

- v6.7.3 October 8, 2012
	- Fixed logging when a fatal error occurs during initialisation
	- We now do warnings when plugins do invalid naming conventions
		- Closes [#313](#313)
		- Help by [Eugene Mirotin](https://github.com/emirotin)
	- We now display the plugin versions in the plugin listing information
		- Help by [ashnur](https://github.com/ashnur)
	- More localization progress
  • Loading branch information...
1 parent 07da6e5 commit 1d9ad2cd71e91404dece88a2ebee25fce57de594 @balupton balupton committed Oct 8, 2012
Showing with 331 additions and 163 deletions.
  1. +9 −0 History.md
  2. +136 −0 locale/en.cson
  3. +2 −1 package.json
  4. +128 −117 src/lib/docpad.coffee
  5. +22 −40 src/lib/interfaces/console.coffee
  6. +34 −5 src/lib/plugin-loader.coffee
View
@@ -1,5 +1,14 @@
## History
+- v6.7.3 October 8, 2012
+ - Fixed logging when a fatal error occurs during initialisation
+ - We now do warnings when plugins do invalid naming conventions
+ - Closes [#313](https://github.com/bevry/docpad/issues/313)
+ - Help by [Eugene Mirotin](https://github.com/emirotin)
+ - We now display the plugin versions in the plugin listing information
+ - Help by [ashnur](https://github.com/ashnur)
+ - More localization progress
+
- v6.7.2 October 3, 2012
- Fixed custom middleware (via the `serverExtend` event) being loaded too late (after the express router middleware)
View
@@ -0,0 +1,136 @@
+{
+ # Subscription
+ subscribePrompt: """
+ Thanks for installing DocPad!
+ As DocPad moves very fast, would you like to subscribe to our newsletter and stay up to date with the latest releases and tutorials?
+ """
+ subscribeConfigNotify: "Great! To speed things up we've fetched your default values, press enter to default to them, or type your own values if you'd prefer."
+ subscribeNamePrompt: "Your nifty name is?"
+ subscribeEmailPrompt: "and your extravagant email is?"
+ subscribeUsernamePrompt: "and what ultimate username would you like for our upcoming cloud infrastructure?"
+ subscribeError: "Whoops, looks like something went wrong when subscribing you to our list... not to worry, we'll try again another time."
+ subscribeSuccess: "Awesome, you're now subscribed our newsletter. By the way, you're looking super fine today! Continuing with the desired action."
+ subscribeIgnore: "No worries. Have a lovely day, and we hope you enjoy DocPad! Continuing with the desired action."
+ subscribeProgress: "Subscribing..."
+ subscribeRequestData: "Subscription request data:"
+ subscribeRequestError: "Subsction request error:"
+
+ # Skeleton
+ skeletonSelectionIntroduction: "You are about to create your new project inside your current directory. Below is a list of skeletons to bootstrap your new project:"
+ skeletonSelectionPrompt: "Which skeleton will you use?"
+ skeletonInstall: "Installing the %s skeleton into %s"
+ skeletonInstalled: "Installed the skeleton succesfully"
+ skeletonExists: "Didn't place the skeleton as the desired structure already exists"
+ skeletonNonexistant: """
+ We couldn't find an existing DocPad project inside your current directory.
+ If you're wanting to use a pre-made skeleton for the basis of your new project, then run DocPad again inside an empty directory.
+ If you're wanting to start your new project from scratch, then refer to the Getting Started guide here:
+ https://docpad.org/get-started
+ For more information on what this means, visit:
+ https://docpad.org/troubleshoot
+ """
+ skeletonNoneName: "No Skeleton"
+ skeletonNoneDescription: "Prefer to start from scratch? You can get started without any skeleton if you wish"
+
+ # Server
+ serverInUse: "Could not start the web server, chances are the desired port %s is already in use"
+ serverStarted: "DocPad listening to %s on directory %s"
+
+ # Watching
+ watchStart: 'Watching setup starting...'
+ watchStarted: 'Watching setup'
+ watchRegenerating: "Regenerating at %s"
+ watchRegenerated: "Regenerated at %s"
+ watchChange: "Change detected at %s"
+ watchIgnoredChange: "Ignored change at %s"
+ watchDirectoryChange: "Directory change at %s"
+ watchConfigChange: "Configuration change detected at %s"
+
+ # Render
+ renderingFiles: "Rendering %s files"
+ renderedFiles: "Rendered %s files"
+ renderInvalidOptions: 'Invalid options passed to the render action'
+ renderProgress: "Currently on %s at %s"
+ renderGenerating: "Generating..."
+ renderGeneratingNotification: "Website generated..."
+ renderGenerated: "Generated %s files"
+ renderGeneratedNotification: "Website generated"
+ renderParsing: 'Parsing everything'
+ renderParsed: 'Parsed everything'
+ renderNonexistant: 'Cannot generate website as the src dir was not found'
+ renderNoPlugins: "DocPad is currently running without any plugins installed. You probably want to install some: https://github.com/bevry/docpad/wiki/Plugins"
+ renderDirectoryParsing: "Parsing directory: %s"
+ renderDirectoryParsed: "Parsed directory: %s"
+ renderDirectoryNonexistant: "Skipped directory: %s (it does not exist)"
+ renderClean: "Cleaned files"
+ renderInterval: "Performing interval regeneration"
+
+ # Contextualize
+ contextualizingFiles: "Contextualizing %s files"
+ contextualizedFiles: "Contextualized %s files"
+
+ # Write
+ writingFiles: "Writing %s files"
+ wroteFiles: "Wrote %s files"
+
+ # Action
+ actionStart: "Performing the action %s"
+ actionFinished: "Performed the action %s"
+
+ # Plugins
+ pluginFailedToLoad: "Failed to load the plugin: %s at %s"
+ pluginsLoadingFor: "Plugins loading for: %s"
+ pluginsLoadedFor: "Plugins loaded for: %s"
+ pluginsSlow: "We're preparing your plugins, this may take a while the first time. Waiting on the plugins: %s"
+ pluginLoading: "loading plugin: %s"
+ pluginLoaded: "Loaded plugin: %s"
+ pluginSkipped: "Skipped plugin: %s"
+ pluginSkippedDueTo: "Skipped the unsupported plugin: %s due to %s"
+ pluginContinued: "Continuing with the unsupported plugin: %s"
+ pluginNamingConventionInvalid: """
+ The plugin %s uses an invalid naming convention. We only allow alphanumeric characters (no symbols). Perhaps change it to %s
+ More information here: https://docpad.org/plugin-conventions
+ """
+ pluginPrototypeNameUndefined: """
+ The plugin %s did not have its name defined in its prototype, defaulting it to the directory naming convention.
+ More information here: https://docpad.org/plugin-conventions
+ """
+ pluginPrototypeNameDifferent: """
+ The plugin %s is using a different name (%s) for its prototype name. This can cause issues.
+ More information here: https://docpad.org/plugin-conventions
+ """
+
+ # Collections
+ addingDocument: "Adding document: %s"
+ addingFile: "Adding file: %s"
+ addingLayout: "Adding layout: %s"
+ addingHtml: "Adding html file: %s"
+ addingStylesheet: "Adding stylesheet file: %s"
+
+ # Loading
+ loadingConfigUrl: "Loading configuration url: %s"
+ loadingConfigPath: "Loading configuration path: %s"
+ loadingFiles: "Loading %s files"
+ loadedFiles: "Loaded %s files"
+ loadingFile: "Loading file: %s"
+ loadingFileFailed: "Failed to load the file: %s"
+ loadingFileIgnored: "Skipped ignored file: %s"
+ loadedFile: "Loaded file: %s"
+
+ # Misc
+ welcome: "Welcome to DocPad %s"
+ welcomePlugins: "Plugins: %s"
+ welcomeEnvironment: "Environment: %s"
+ includeFailed: "Could not include the file at path %s as we could not find it"
+ errorOccured: "An error occured:"
+ errorLoggedTo: "Error has been logged to: %s"
+ errorFollows: "The error follows:"
+ unknownModelInCollection: "Unknown model structure inside the collection"
+ upgradeNotification: "There is a new version of %s available"
+ upgradeDetails: """
+ There is a new version of %s available, you should probably upgrade...
+ current version: %s
+ new version: %s
+ grab it here: %s
+ """
+}
View
@@ -1,6 +1,6 @@
{
"name": "docpad",
- "version": "6.7.2",
+ "version": "6.7.3",
"description": "DocPad is a language agnostic document management system. This means you write your website as documents, in whatever language you wish, and DocPad will handle the compiling, templates and layouts for you. For static documents it will generate static files, for dynamic documents it'll re-render them on each request. You can utilise DocPad by itself, or use it as a module your own custom system. It's pretty cool, and well worth checking out. We love it.",
"homepage": "https://github.com/bevry/docpad",
"keywords": [
@@ -69,6 +69,7 @@
"mime": "1.2.x",
"query-engine": ">=1.2.3 <1.3",
"semver": "1.0.x",
+ "request": "2.11.x",
"underscore": "1.3.x",
"watchr": ">=2.1.5 <2.2",
"yaml": "0.2.1"
Oops, something went wrong.

0 comments on commit 1d9ad2c

Please sign in to comment.