From 1d88c7a098bce64be62252ec9a33cdf16a1e59d7 Mon Sep 17 00:00:00 2001 From: Fatehsandhu Date: Fri, 13 Oct 2017 15:06:36 -0400 Subject: [PATCH 01/25] First working code --- Vagrantfile | 4 ++-- scripts/setup-services.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index aa308559e..dc1a2b4a9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -11,8 +11,8 @@ Vagrant.configure("2") do |config| # VM, but users are encouraged to test this and make adjustments below (or file PRs) # if you find the VM lagging or unresponsive. config.vm.provider "virtualbox" do |v| - v.memory = 1536 - v.cpus = 1 + v.memory = 2536 + v.cpus = 2 v.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/vagrant", "1"] end diff --git a/scripts/setup-services.sh b/scripts/setup-services.sh index e0e19976c..f8976651c 100644 --- a/scripts/setup-services.sh +++ b/scripts/setup-services.sh @@ -83,7 +83,7 @@ echo "Setting up login.webmaker.org" cd login.webmaker.org cp env.sample .env sudo npm install --no-bin-links --loglevel=error # sudo needed for bcrypt permissions -cd .. +sudo npm install --no-bin-links || sudo npm install --no-bin-links # --- # --- id.webmaker.org setup and database setup --- From 22821000bf13c31ae929857865116e54dd5af659 Mon Sep 17 00:00:00 2001 From: Fatehsandhu Date: Fri, 20 Oct 2017 12:44:57 -0400 Subject: [PATCH 02/25] modified: ../../locales/en-GB/server.properties modified: publish.html --- locales/en-GB/server.properties | 1 + views/editor/publish.html | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/locales/en-GB/server.properties b/locales/en-GB/server.properties index 9f7e3c743..422c2d868 100644 --- a/locales/en-GB/server.properties +++ b/locales/en-GB/server.properties @@ -94,6 +94,7 @@ navToggleAutoUpdateLabel=Auto # Publishing publishHeader=Publish your Project publishShareLink=Here's a link you can share... +publishEmbedLinkTitle=Copy this code into your HTML page to show off your project. publishChangesPrompt=You've made changes since you last published this project. publishProjectDescription=Project Description publishCancelBtn=Cancel diff --git a/views/editor/publish.html b/views/editor/publish.html index 357d4d3a5..d58d606dd 100644 --- a/views/editor/publish.html +++ b/views/editor/publish.html @@ -16,10 +16,17 @@

{{ gettext("publishHeader") }}

+

{{ gettext("publishShareLink") }}

+ + +

{{ gettext("publishEmbedLinkTitle") }}

+
@@ -28,10 +35,10 @@

{{ gettext("publishHeader") }}

- +
- +
From a0bbb834db231b8dd8a7a39d02e989edb8360aa3 Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Fri, 20 Oct 2017 12:52:25 -0400 Subject: [PATCH 03/25] Update Vagrantfile --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index dc1a2b4a9..aa308559e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -11,8 +11,8 @@ Vagrant.configure("2") do |config| # VM, but users are encouraged to test this and make adjustments below (or file PRs) # if you find the VM lagging or unresponsive. config.vm.provider "virtualbox" do |v| - v.memory = 2536 - v.cpus = 2 + v.memory = 1536 + v.cpus = 1 v.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/vagrant", "1"] end From 73aa025755106374223ac644bb1da1fcad25e8bd Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Fri, 20 Oct 2017 12:53:01 -0400 Subject: [PATCH 04/25] Update publish.html --- views/editor/publish.html | 1 - 1 file changed, 1 deletion(-) diff --git a/views/editor/publish.html b/views/editor/publish.html index d58d606dd..bcb4bd614 100644 --- a/views/editor/publish.html +++ b/views/editor/publish.html @@ -38,7 +38,6 @@

{{ gettext("publishHeader") }}

-
From 8d0f36603cd6a94356064a3e17fcb0bf26fec378 Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Fri, 20 Oct 2017 12:53:46 -0400 Subject: [PATCH 05/25] Update publish.html --- views/editor/publish.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/editor/publish.html b/views/editor/publish.html index bcb4bd614..00e09fd8d 100644 --- a/views/editor/publish.html +++ b/views/editor/publish.html @@ -35,7 +35,7 @@

{{ gettext("publishHeader") }}

- +
From ed90fa664b5627afdd6b61972be4f70c07098355 Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Fri, 20 Oct 2017 12:54:20 -0400 Subject: [PATCH 06/25] Update publish.html --- views/editor/publish.html | 1 + 1 file changed, 1 insertion(+) diff --git a/views/editor/publish.html b/views/editor/publish.html index 00e09fd8d..38423a960 100644 --- a/views/editor/publish.html +++ b/views/editor/publish.html @@ -31,6 +31,7 @@

{{ gettext("publishHeader") }}

{{ gettext("publishDeleteBtn") }} +
From 41008812c02effdca56850af9495bbcb8396af3b Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Fri, 20 Oct 2017 12:54:46 -0400 Subject: [PATCH 07/25] Update publish.html --- views/editor/publish.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/editor/publish.html b/views/editor/publish.html index 38423a960..f9ff506b4 100644 --- a/views/editor/publish.html +++ b/views/editor/publish.html @@ -31,13 +31,13 @@

{{ gettext("publishHeader") }}

{{ gettext("publishDeleteBtn") }} -
+
From d1214cfd03a62ea58ec51b2bf798c5f7848daba0 Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Fri, 20 Oct 2017 12:55:10 -0400 Subject: [PATCH 08/25] Update publish.html --- views/editor/publish.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/editor/publish.html b/views/editor/publish.html index f9ff506b4..517e38d09 100644 --- a/views/editor/publish.html +++ b/views/editor/publish.html @@ -36,9 +36,9 @@

{{ gettext("publishHeader") }}

- - +
+
From 830358e314173c934c8fbef131d4e24f65745cf0 Mon Sep 17 00:00:00 2001 From: Fatehsandhu Date: Wed, 22 Nov 2017 10:20:32 -0500 Subject: [PATCH 09/25] Jquery not working need help --- locales/en-US/server.properties | 262 ++------------------------ public/editor/scripts/ui/publisher.js | 7 +- views/editor/publish.html | 10 +- 3 files changed, 25 insertions(+), 254 deletions(-) diff --git a/locales/en-US/server.properties b/locales/en-US/server.properties index b979f6133..422c2d868 100644 --- a/locales/en-US/server.properties +++ b/locales/en-US/server.properties @@ -15,21 +15,15 @@ newProjectBtn=Start a project from scratch contactEmail=Email Us contactTwitter=Talk to us on Twitter readTheDocs=Read the Docs -contribute=Contribute on GitHub +contribute=Contribute on Github termsOfUse=Terms of Use privacyPolicy=Privacy Policy thimbleFooter=Thimble is part of the Mozilla Learning Network.
Learn to teach like mozilla at learning.mozilla.org. -pageTitleGetInvolved=Thimble by Mozilla - Get Involved -pageTitleFeatures=Thimble by Mozilla - Features + # Userbar signInPromptHomepage= or -# Reload Preview Page -errorCantLoadPreviewTitle=Oh no, something's wrong! -errorCantLoadPreview=We could not load the preview, please reload to try again... -reloadButtonLabel=Reload - ############ ## Editor ## ############ @@ -37,31 +31,18 @@ reloadButtonLabel=Reload # Loading the editor loadingProject=Loading Project loadingProjectSupportSuggestion=If the project doesn't load, get help here. -reloadThimbleMessage=Please reload your browser to try loading Thimble again. -errorCouldNotStart=Thimble could not start. errorLoadingProject=There was an error loading your Project.
Please refresh your browser. errorLoadingProjectSuggestion=NOTE: if you are using Private Browsing mode, please reload in normal mode. errorUnsupportedBrowser=Sorry, Thimble won't work in your Browser errorUnsupportedBrowserSuggestion1=Thimble works in all of the following browsers: Firefox, Chrome, Internet Explorer 11, Microsoft Edge, Safari (8+), and Opera. errorUnsupportedBrowserIgnore=Let me try anyway! errorLoadingProjectBramble=For error details open your browser's Developer Tools console. -refreshForUpdates=Thimble has Updates - Please refresh your browser to get the latest changes. -projectNotLoadingMessage=Your project seems to be taking a long time to load.
If it doesn't load, please reload the page to try again. -tryAgainButtonLabel=Try Again -emailForHelp=If that doesn't help, let us know. # Userbar -userbarGetStarted=Get Started -userbarCoolFeatures=Cool Features -userbarGetInvolved=Get Involved help=Help -helpTroubleshooting=Troubleshooting -helpFAQ=FAQ -helpFeatures=Features deleteProjectLink=Delete Project downloadProjectLink=Download files (.zip) signInPromptEditor= or to Save and {{ publishBtnOpenTag }}Publish{{ publishBtnCloseTag }} -backToHomepage=Go back to the Thimble homepage # Navigation bar navFiles=FILES @@ -69,155 +50,54 @@ navHTMLFile=Add HTML file navCSSFile=Add CSS file navJavascriptFile=Add JavaScript file navTutorialFile=Add a Tutorial -# Tooltip shown for adding a new folder in the files menu -navAddFolderTitle=Add a new Folder -# Text to display in the files menu for adding a new folder -navAddFolder=Add Folder -navUploadFile=Upload a file… +navUploadFile=Upload a file... navEditor=EDITOR navUndo=Undo navTextSize=Text size -navColorTheme=Color theme +navColorTheme=Colour theme navWrapText=Wrap long lines navAllowJS=Allow JavaScript -navAllowWS=Show White Space -navAutoComplete=Autocomplete code -navAutoEncloseTags=Auto close tags -navSVGedit=Edit SVG images as code navPreview=PREVIEW navViewTutorial=TUTORIAL navToggleAutoUpdateTitle=Toggle Preview Auto-refresh navToggleAutoUpdateLabel=Auto # Code Snippet Data -snippetHTMLComment=Comment -snippetHTMLCommentTitle=Add a Comment # Example text inside a comment which in HTML will be and in CSS/JS will be /* Add your comment here */ -snippetCommentData=Add your comment here -snippetHTMLTable=Table -snippetHTMLTableTitle=Add a Table -snippetHTMLTableHeading=Heading -snippetHTMLTableValue=Value -snippetHTMLDefinitionList=Definition List -snippetHTMLDefinitionListTitle=Add a Definition List -snippetHTMLOrderedList=Ordered List -snippetHTMLOrderedListTitle=Add an Ordered List -snippetHTMLItem1=Item 1 -snippetHTMLItem2=Item 2 -snippetHTMLItem3=Item 3 -snippetHTMLUnorderedList=Unordered List -snippetHTMLUnorderedListTitle=Add an Unordered List -snippetHTMLForm=Form -snippetHTMLFormTitle=Add a Form # Label in a form next to an input text box -snippetHTMLFormFirstNameLabel=First name # Label in a form next to an input text box -snippetHTMLFormLastNameLabel=Last name # Submit button text in a form -snippetHTMLFormSubmit=Submit -snippetHTMLScript=Include a JavaScript file -snippetHTMLScriptTitle=Add a Script -snippetHTMLExternalStylesheet=Include a CSS file -snippetHTMLExternalStylesheetTitle=Add an External Stylesheet -snippetHTMLExternalStyleSheetComment=Add the tag to your HTML file. These usually go in the tag -snippetHTMLVideo=Video Player -snippetHTMLVideoTitle=Add a Video player to your page # Text that shows up between the tags as a fallback -snippetHTMLVideoData=Your browser does not support the video tag. -snippetHTMLAudio=Audio Player -snippetHTMLAudioTitle=Add an Audio player to your page # Text that shows up between the tags as a fallback -snippetHTMLAudioData=Your browser does not support the audio tag. -snippetHTMLMetaMobile=Mobile Meta -snippetHTMLMetaMobileTitle=Add Mobile Metadata -snippetCSSComment=Comment -snippetCSSCommentTitle=Add a Comment to your CSS file -snippetCSSTagNameSelector=Element Type Selector -snippetCSSTagNameSelectorTitle=Style a tag by name -snippetCSSClassSelector=Class Selector -snippetCSSClassSelectorTitle=Style elements with a class -snippetCSSIDSelector=ID Selector -snippetCSSIDSelectorTitle=Style an element by its ID -snippetCSSKeyframe=Keyframe Animation -snippetCSSKeyframeTitle=Add a Keyframe Animation # Description of animation code inside a CSS comment /* The animation code */ -snippetCSSKeyframeAnimationComment=The animation code # Description of animation code inside a CSS comment /* The element to apply the animation to */ -snippetCSSKeyframeAnimationTargetComment=The element to apply the animation to -snippetCSSAnchorStyle=Link Styles -snippetCSSAnchorStyleTitle=Style an Anchor Tag # Description of unvisited anchor CSS selector inside a CSS comment /* unvisited link */ -snippetCSSAnchorStyleUnvisitedLinkComment=Basic Style # Description of visited anchor CSS selector inside a CSS comment /* visited link */ -snippetCSSAnchorStyleVisitedLinkComment=Visited # Description of mouseover anchor CSS selector inside a CSS comment /* mouseover link */ -snippetCSSAnchorStyleHoverLinkComment=Hovered # Description of selected anchor CSS selector inside a CSS comment /* selected link */ -snippetCSSAnchorStyleActiveLinkComment=Active -snippetCSSMediaQuery=Media Queries -snippetCSSMediaQueryTitle=Add a Media Query # Description of data to add for a CSS media query inside a CSS comment /* Rules when screen is up to 320px wide */ -snippetCSSMediaQueryNarrow=Rules when screen is up to 320px wide # Description of data to add for a CSS media query inside a CSS comment /* Rules when screen is between 321px and 768px wide */ -snippetCSSMediaQueryMedium=Rules when screen is between 321px and 768px wide # Description of data to add for a CSS media query inside a CSS comment /* Rules when screen is wider than 768px */ -snippetCSSMediaQueryWide=Rules when screen is wider than 768px -snippetCSSFont=Fonts -snippetCSSFontTitle=Declare a Font -snippetCSSPseudo=Add a Pseudo Element -snippetCSSPseudoTitle=Add content to your page with CSS using a pseudo element # Description of an example :after CSS pseudo selector that will show up in CSS comment /* Adds an arrow before every element with class='arrow' */ -snippetCSSPseudoComment=Adds an arrow before every element with class='arrow' -snippetJSFunction=A Basic Function -snippetJSFunctionTitle=Add a simple function that accepts one argument -snippetJSComment=Comment -snippetJSCommentTitle=Add a Comment to your JavaScript file # This will go inside a console.log(). Please leave the quotes in the translated string and do not translate `name` as it is a javascript variable. For eg. the string will be displayed as `console.log("Hello, " + name);` -snippetJSLogHello="Hello, " + name # This will go inside a console.log(). -snippetJSLogHelloStranger=Hello, stranger! # A common person's name that will be used in a snippet. For e.g. `functionCall("David")` -snippetJSPersonName1=David # A common person's name that will be used in a snippet. For e.g. `functionCall("Bob")` -snippetJSPersonName2=Bob # A common person's name that will be used in a snippet. For e.g. `functionCall("Kate")` -snippetJSPersonName3=Kate -snippetJSForLoop=For Loop -snippetJSForLoopTitle=Add a For Loop # Description of what needs to happen inside a JS loop as a JS comment // Do something in this loop -snippetJSLoopData=Do something in this loop -snippetJSWhileLoop=While Loop -snippetJSWhileLoopTitle=Add a While Loop -snippetJSSwitchCase=Switch Statement -snippetJSSwitchCaseTitle=Add a Switch/Case conditional # Description of what needs to happen inside a JS conditional block (if/switch) as a JS comment // Do something for this case -snippetJSConditionalComment=Do something for this case # Description of what needs to happen inside the fallback JS conditional block (else/default) as a JS comment // Do something if no condition was met -snippetJSConditionalDefaultComment=Do something if no condition was met -snippetJSIfElse=If...Else Statement -snippetJSIfElseTitle=Add an If...Else conditional -snippetJSArray=Array -snippetJSArrayTitle=Create an Array -snippetJSObject=Object -snippetJSObjectTitle=Create an Object Literal -snippetJSClickHandler=Add a Click Event -snippetJSClickHandlerTitle=Do something when an element is clicked # Description of an example of using document.querySelector() which will show up in a JS comment // Select an element with id="button" -snippetJSClickHandlerComment=Select an element with id="button" # Will show up as `console.log("Click!")` -snippetJSClickHandlerLog=Click! -snippetJSChangeStyle=Change CSS Property -snippetJSChangeStyleTitle=Change a CSS property of an element # Description of an example of changing an HTML element's style in JS which will show up in a JS comment // Select the element with id='alert' -snippetJSChangeStyleComment=Select the element with id='alert' # Publishing publishHeader=Publish your Project -publishShareLink=Here's a link you can share… +publishShareLink=Here's a link you can share... +publishEmbedLinkTitle=Copy this code into your HTML page to show off your project. publishChangesPrompt=You've made changes since you last published this project. publishProjectDescription=Project Description publishCancelBtn=Cancel -noIndexFound=Please add an "index.html" file before publishing your project. Learn more ################## ## Project List ## @@ -225,113 +105,20 @@ noIndexFound=Please add an "index.html" file before publishing prjListNewProjectBtn=Create a new Project prjListDeleteProjectBtn=Delete -prjListCancelDeleteProjectBtn=Cancel publishedLink=Published Version -deleteProjects=Delete Projects ################### ## Features page ## ################### -featuresHeader=Awesome features make learning
and teaching coding easy & fun -featuresCallout=Thimble is a full-featured code editor that runs right in the browser. It's designed to help new coders create their own sites and web-based projects using HTML, CSS & JavaScript. Everything you need is at your fingertips, allowing you (or your classroom) to get up and running as quickly as possible. -featuresCalloutDesc=It's a code editor, web server, web browser & developer tools all in one—and it's free! - -livePreviewFeatureTitle=Instantly see your changes -livePreviewFeatureDesc=Create and experiment and faster with the Live Preview. It shows the changes to your code instantly. -remixFeatureTitle=Remix any Thimble project -remixFeatureDesc=Like a Thimble project that you see? Remix it to create your very own version. You can also send your project to friends or students—what they can come up with? -snippetsFeatureTitle=Handy Code Snippets -snippetsFeatureDesc=Work faster by making use a handy list of HTML, CSS & JavaScript code snippets that you can include in your code. -consoleFeatureTitle=Built-in JavaScript Console -consoleFeatureDesc=Working on some JavaScript? Thimble's built-in console makes it easier than ever to test and debug your code. -fileTreeFeatureTitle=Add and manage files -fileTreeFeatureDesc=Thimble works like a real web project, you can create, rename, delete and even upload your own files. -fileTreeFeatureDescHighlight1=Download a .zip of your project and view it from your hard drive -fileTreeFeatureDescHighlight2=Drag & drop files from your computer into Thimble -fileTreeFeatureDescHighlight3=Download any file in your project via the right-click menu -themeFeatureTitle=Turn the lights on and off -themeFeatureDesc=Thimble comes with a dark and light theme, so pick what's best for you. You can also change other options like the size of the text. -tutorialFeatureTitle=Follow & create embedded tutorials -tutorialFeatureDesc=Projects can have tutorials that help you (or your students) learn as they make changes to the projects. -autocompleteFeatureTitle=Get code hints as you type -autocompleteFeatureDesc=Don't get stuck trying to remember a lot of rules and syntax. Thimble will give you hints in HTML, CSS and even JavaScript files. -inlineCSSFeatureTitle=Edit CSS right in your HTML pages -inlineCSSFeatureDesc=Write CSS styles for your elements without switching away from the HTML page that you are editing. Put the text cursor on any element tag and hit Cmd/Ctrl + E to start writing CSS styles. -publishingFeatureTitle=Publish projects to the web fast -publishingFeatureDesc=You can publish your projects to the web with only a single click. Later on, when you make changes, you can easily update your project. -colorpickerFeatureTitle=Pick colors right in the editor -colorpickerFeatureDesc=Put the text cursor on any color value in a CSS file and press Cmd/Ctrl + E to open the color picker. -previewModesFeatureTitle=Test your project on a mobile device -previewModesFeatureDesc=Switching to the mobile preview mode lets you see your work on a narrow device. Then, turn on the full-screen preview to get the big picture. -inspectorFeatureTitle=Find HTML elements fast -inspectorFeatureDesc=Turn on the DOM Inspector and hover over different elements in the preview. Thimble will highlight the related code in the HTML editor. -imageFiltersFeatureTitle=Image Filters -imageFiltersFeatureDesc=Add some fun to your project by adding filters to your images. Cats never looked so good before! -takeASelfieFeatureTitle=Take a Selfie -takeASelfieFeatureDesc=Add your mugshot to any page your're working on using Thimble's selfie tool—it uses your computer's webcam. Just start typing <img src= tag to your HTML page and you'll see a prompt. + ####################### ## Get Involved page ## ####################### -getInvolvedHeader=Curious about Open Source?
Help us build & improve Thimble! -fileAnIssueBtn=File an issue -goodFirstBugBtn=Find a “Good First Bug” to work on -whyContributeTitle=Why Contribute? -contributeReason1=Your work impacts users all over the world -contributeReason2=Gain valuable experience and mentorship -contributeReason3=Support Mozilla's mission of an open internet for all -contributeReason4=It feels good! -getInvolvedDescription1=Thimble is an Open Source project created by the Mozilla Foundation in partnership with CDOT at Seneca College. Since the beginning, contributors from all over the world have played an important role in making it a success. -getInvolvedDescription2=It's truly an international project, it has been localized in 33 languages (with over 100 in progress) and used by learners in over 200 countries. -noContributionTooSmallTitle=No contribution is too small -noContributionTooSmallDesc=Contributions of all skills and backgrounds are welcome. You don't need to be an expert programmer, in fact, over half of our contributors identify themselves as students. You can start small, file an issue to… -noContributionTooSmallReason1=Report bug, problem or typo -noContributionTooSmallReason2=Request a change, new feature or starter project -noContributionTooSmallReason3=Leave feedback -goFileAnIssueBtn=Go on, File an Issue! -feelingAdventurous=If you're feeling adventurous, then check out our GitHub repositories below. -onGithub=On GitHub -goodFirstBugsBadge=Good First Bugs -contributingGuidelines=Contributing Guidelines -getInTouch=Get in Touch -getInTouchChat=Thimble Chat Channel -getInTouchEmail=Email us - -featuredContributors=Featured Contributors -featuredContributorsDesc=Over 350 contributors from more than 30 countries have been involved in the Thimble project. Here are some of the many generous folks that have contributed their time & energy to make Thimble better! - -twigz20Contrib1=Added a code snippets menu to make coding easier -twigz20Contrib2=Fixed JavaScript auto toggle bugs -twigz20Quote=“When first starting on Thimble I had little to no experience/knowledge of JavaScript. It took me a while to get my bearings. As I started working on this project I had many hurdles to cross. But with the help of the core team I was able to slowly cross those hurdles. I still have lots to learn, but I'm happy with the progress so far!” -sanariaz154Contrib1=Added extra padding to the Editor to improve legibility -sanariaz154Quote=“We all need people who will give us feedback. That's how we improve. Working with Thimble was the most encouraging experience for me in opensource world and it gave me a chance to work with most friendly and supporting team.” -raygervaisContrib1=Added a JavaScript console to help learners to debug their code and find errors -raygervaisContrib2=Improved the usability of Thimble menus -raygervaisQuote=“Contributing to Thimble enabled me to learn about modern JavaScript web applications, an experience which has already helped further my career to new heights and possibilities. Open Source has changed the world, and with it, I believe we can do anything.” -hkiratContrib1=Created a custom UI to edit parameters for A-frame tags -hkiratContrib2=Made code completion an optional setting -hkiratContrib3=Researched tech approaches to collaborative editing -hkiratQuote=“Working on Thimble has been a great experience. The code is very well written and the mentors are really supportive. It is one of the best projects to work in if you want to start working on open source and contributing has taught me a lot about open source best practices.” -cgsinghContrib1=Added descriptions to projects page -cgsinghContrib2=Made auto closing tags an optional setting -cgsinghContrib3=Fixed a longstanding usability bug with the Publish button -cgsinghQuote=“Jumping into Thimble the first time around was daunting. But then I started to contribute, and it became satisfying. I learned a lot about what I usually sidelined — web development. In Open Source development, I never felt alone. Bring all these talented minds together, and something as great as Thimble can happen.” -peiying16Contrib1fix=Added support for file icons in the file list -peiying16Contrib2=Fixed bug related to JavaScript settings -peiying16Contrib3=Support for editing SVG files right in the editor -peiying16Quote=“I love Thimble, and I love fixing bug with Thimble team.” -th30Contrib1=Updated menu transition effects -th30Contrib2=Made sure files are properly highlighted in the editor -th30Quote=“Working with thimble proved to be challenging and explosive way to get into open source. It really made me collaborate and work with some amazing individuals, which always made you feel like your mistakes are merely opportunities to further improve your releases. Persistence is key, and always turn feedback into a lesson opportunity!” -omytryniukContrib1=Improved the built-in image viewer UI -omytryniukContrib2=Added several UI improvements and fixed front-end styling and functionality bugs -omytryniukContrib3=Updated node dependencies in the Thimble project -omytryniukQuote=“For me, working on Thimble is not just about gaining valuable programming experience but more importantly a feeling of accomplishment and contributing to a product that is used by people all around the world. Realizing that millions of people benefit from the code I write is what drove me to apply to work on Thimble. The other important factor is the friendly and supportive community within the project which is another reason that makes my open source development experience with Thimble fascinating.” -timmoyContrib1=Fixed a bug related to the auto-refresh setting on the preview panel — it now remembers the setting when the browser is refreshed -timmoyContrib2=Added a feature that lets you add filters to images in a project -timmoyQuote=“Prior to Thimble, I worked with relatively small programs that I coded myself or in a small group. Working on code that spans hundreds (probably thousands!) of files being worked on by over 300 people definitely opened up my mind in what “working with others” could mean. I found that there is definitely a learning curve to get used to the environment, but there's always friendly faces that will help you get started as well as with troubles you may have along the way. Just after a few months, I'm able to contribute to the community more than I imagined before. Imagine the possibilities that we can all achieve together as open source continues to grow!” + + ############ ## Shared ## @@ -360,14 +147,11 @@ contributeTitle=Contribute # Remix projects gallery lessonPlan=Lesson Plan gallerySearchPlaceholder=Search for a topic -viewProject=View -byAuthor=By noResultsTitle=Oh no! No matching projects found. noResultsText=You can clear your search to see featured projects and popular tags. -projectLoadingInProgress=Loading projects… +projectLoadingInProgress=Loading projects... projectLoadingError=Unable to load project gallery! Let us know! clearSearchTerm=Clear the search term -submitProject=Do you have a good starter project? We'd love to include it. Let us know! ############ ## Editor ## @@ -381,15 +165,14 @@ renameProjectInputBoxTitle=Rename your Project helpIconTitle=Visit the Help site # Navigation bar -navAddFileIconTitle=New file -navHTMLTitle=New HTML file -navCSSTitle=New CSS file -navJavascriptTitle=New JavaScript file -navTutorialTitle=New Tutorial +navAddFileIconTitle=Add a file to your project +navHTMLTitle=Add an HTML file +navCSSTitle=Add a CSS file +navJavascriptTitle=Add a JavaScript file +navTutorialTitle=Add a Tutorial navUploadTitle=Upload a file from your computer navCollapseFileTrayIconTitle=Collapse the file tray navExpandFileTrayIconTitle=Expand the file tray -snippetMenuTitle=Insert a Code Snippet navUndoTitle=Undo your last edit navRedoIconTitle=Redo your last edit navEditorOptionsIconTitle=Change editor options @@ -399,10 +182,6 @@ navDarkThemeIconTitle=Switch to the dark theme navLightThemeIconTitle=Switch to the light theme navWrapTextTitle=Toggle wrapping long lines of code navAllowJSTitle=Toggle running JavaScript code in the preview -navAllowWSTitle=Toggle running WhiteSpace Indicator -navAutoCompleteTitle=Toggle Autocomplete -navAutoEncloseTagsTitle=Toggle automatically closing HTML tags -navXMLSVGTitle=View SVG files as code instead of as image navPreviewTitle=View the Preview navViewTutorialTitle=View the Project Tutorial navDOMElementInspectorIconTitle=Toggle Element Inspector @@ -411,10 +190,8 @@ navDesktopPreviewIconTitle=Preview in desktop mode navMobilePreviewIconTitle=Preview in mobile mode navEnableFullscreenPreviewIconTitle=Enable fullscreen preview navDisableFullscreenPreviewIconTitle=Disable fullscreen preview -navInsertSnippetIconTitle=Add a code snippet # Snippet Menu -snippetButtonLabel=Insert # Publishing publishShareLinkTitle=Your published project @@ -427,7 +204,6 @@ publishBtnTitle=Publish and share your Project prjListNewProjectBtnTitle=Start a new project from scratch prjListDeleteProjectBtnTitle=Delete this Project -prjListCancelDeleteProjectBtnTitle=Cancel deletion of this project ############ ## Shared ## @@ -436,8 +212,6 @@ prjListCancelDeleteProjectBtnTitle=Cancel deletion of this project # Errors errorDetailsHeader=Error Details errorSomethingWentWrong=Oops, something went wrong! -errorNotSureWhatWrong=We're not sure what went wrong, but why don't you try again. -errorKeepSeeingPage=If you keep seeing this page, please let us know... errorPageNotFound=Oh no, page not found! errorPageNotFoundDetails=If you think this page should be here,
let us know. errorSomethingWentWrongDetails=Please try what you did again. If you keep seeing this error, let us know. @@ -446,7 +220,7 @@ errorHttpAuthenticationFailed=Authentication Failed ({{ httpStatusCode }}) errorHttpClientError=Thimble Application Error ({{ httpStatusCode }}) errorHttpNotFound=Not Found ({{ httpStatusCode }}) errorLoadingThimble=Failed to load Thimble! -errorAuthenticating=Failed to log in! +errorAuthenticating=Failed to login! errorMigratingProject=Failed to recover the project you were working on! errorCreatingProject=Failed to create the project! errorGettingProjectList=Failed to get the list of your projects! @@ -461,10 +235,6 @@ errorGettingProjectFiles=Failed to get the project's files! errorCreatingFile=Failed to create new file! errorUpdatingFile=Failed to update the file! errorDeletingFile=Failed to delete the file! -pleaseSignOut=Please Sign Out -pleaseSignOutMessage=Something went wrong on our end, but if you Sign Out and then Sign In again, things should return to normal. -signOutButtonLabel=Sign Out Now -letUsKnowMessage=If you keep seeing this page, let us know... ####################### ## Project Remix Bar ## diff --git a/public/editor/scripts/ui/publisher.js b/public/editor/scripts/ui/publisher.js index 14d5d3965..f82f0fa73 100644 --- a/public/editor/scripts/ui/publisher.js +++ b/public/editor/scripts/ui/publisher.js @@ -31,15 +31,17 @@ function Publisher() { update: $("#publish-button-update"), unpublish: $("#publish-button-unpublish"), parent: $("#publish-buttons"), - indexMessage: $("#no-index") + indexMessage: $("#no-index"), }, description: $("#publish-details > textarea.publish-description"), + embed: $("#link-publish-embed"), published: { link: $("#publish-link > a"), changed: $("#publish-changes"), container: $("#publish-live") } }; + this.$("#link-publish-embed").text("Testing"); this.dialogEl = $("#publish-dialog"); this.button = $("#navbar-publish-button"); } @@ -310,7 +312,8 @@ Publisher.prototype.updateDialog = function(publishUrl, allowUnpublish) { var published = this.dialog.published; var unpublishBtn = this.dialog.buttons.unpublish; var unpublish = this.handlers.unpublish; - + + published.embed.text(""); // Expose the published state with the updated link published.link.attr("href", publishUrl).text(publishUrl); published.changed.addClass("hide"); diff --git a/views/editor/publish.html b/views/editor/publish.html index d58d606dd..362f23840 100644 --- a/views/editor/publish.html +++ b/views/editor/publish.html @@ -16,16 +16,14 @@

{{ gettext("publishHeader") }}

-

{{ gettext("publishShareLink") }}

-

{{ gettext("publishEmbedLinkTitle") }}

@@ -35,10 +33,10 @@

{{ gettext("publishHeader") }}

- +
- +
@@ -48,4 +46,4 @@

{{ gettext("publishHeader") }}

{{ gettext("publishBtn") }}
-{% endblock %} +{% endblock %} \ No newline at end of file From f9bddb8870e2bd71716d0970452cffd13634f004 Mon Sep 17 00:00:00 2001 From: Fatehsandhu Date: Wed, 22 Nov 2017 10:38:48 -0500 Subject: [PATCH 10/25] Jquery not working help --- locales/en-GB/server.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/locales/en-GB/server.properties b/locales/en-GB/server.properties index 422c2d868..2d576cdb4 100644 --- a/locales/en-GB/server.properties +++ b/locales/en-GB/server.properties @@ -94,7 +94,6 @@ navToggleAutoUpdateLabel=Auto # Publishing publishHeader=Publish your Project publishShareLink=Here's a link you can share... -publishEmbedLinkTitle=Copy this code into your HTML page to show off your project. publishChangesPrompt=You've made changes since you last published this project. publishProjectDescription=Project Description publishCancelBtn=Cancel @@ -243,4 +242,4 @@ errorDeletingFile=Failed to delete the file! thimbleByMozilla=Thimble By Mozilla remixWithThimble=Remix this project with Thimble remix=Remix -createdBy=By {{ author }} +createdBy=By {{ author }} \ No newline at end of file From a4c0413102ade743c050005b4fc7dd38d8e7de1a Mon Sep 17 00:00:00 2001 From: Fatehsandhu Date: Wed, 22 Nov 2017 11:03:09 -0500 Subject: [PATCH 11/25] Jquery not working help --- scripts/invalidate.js | 0 scripts/localize-brackets.sh | 0 scripts/localize/index.js | 0 scripts/setup-services.sh | 2 +- scripts/sql/oauth-setup.sql | 0 scripts/verify-brackets.js | 0 6 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 scripts/invalidate.js mode change 100644 => 100755 scripts/localize-brackets.sh mode change 100644 => 100755 scripts/localize/index.js mode change 100644 => 100755 scripts/setup-services.sh mode change 100644 => 100755 scripts/sql/oauth-setup.sql mode change 100644 => 100755 scripts/verify-brackets.js diff --git a/scripts/invalidate.js b/scripts/invalidate.js old mode 100644 new mode 100755 diff --git a/scripts/localize-brackets.sh b/scripts/localize-brackets.sh old mode 100644 new mode 100755 diff --git a/scripts/localize/index.js b/scripts/localize/index.js old mode 100644 new mode 100755 diff --git a/scripts/setup-services.sh b/scripts/setup-services.sh old mode 100644 new mode 100755 index f8976651c..e0e19976c --- a/scripts/setup-services.sh +++ b/scripts/setup-services.sh @@ -83,7 +83,7 @@ echo "Setting up login.webmaker.org" cd login.webmaker.org cp env.sample .env sudo npm install --no-bin-links --loglevel=error # sudo needed for bcrypt permissions -sudo npm install --no-bin-links || sudo npm install --no-bin-links +cd .. # --- # --- id.webmaker.org setup and database setup --- diff --git a/scripts/sql/oauth-setup.sql b/scripts/sql/oauth-setup.sql old mode 100644 new mode 100755 diff --git a/scripts/verify-brackets.js b/scripts/verify-brackets.js old mode 100644 new mode 100755 From 8b81b0deef72844dd002555e639771afa1b50b97 Mon Sep 17 00:00:00 2001 From: Fatehsandhu Date: Wed, 22 Nov 2017 11:07:49 -0500 Subject: [PATCH 12/25] Jquery not working help --- scripts/setup-services.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/setup-services.sh b/scripts/setup-services.sh index e0e19976c..512a98660 100755 --- a/scripts/setup-services.sh +++ b/scripts/setup-services.sh @@ -84,6 +84,7 @@ cd login.webmaker.org cp env.sample .env sudo npm install --no-bin-links --loglevel=error # sudo needed for bcrypt permissions cd .. +sudo npm install --no-bin-links || sudo npm install --no-bin-links # --- # --- id.webmaker.org setup and database setup --- From 9e0a74939f0ade4b128550f8bd00ec4401c248ca Mon Sep 17 00:00:00 2001 From: Fatehsandhu Date: Wed, 22 Nov 2017 11:16:33 -0500 Subject: [PATCH 13/25] Jquery not working help --- locales/en-GB/server.properties | 2 +- locales/en-US/server.properties | 261 ++++++++++++++++++++++++-- public/editor/scripts/ui/publisher.js | 1 - 3 files changed, 248 insertions(+), 16 deletions(-) mode change 100644 => 100755 locales/en-GB/server.properties mode change 100644 => 100755 locales/en-US/server.properties diff --git a/locales/en-GB/server.properties b/locales/en-GB/server.properties old mode 100644 new mode 100755 index 2d576cdb4..9f7e3c743 --- a/locales/en-GB/server.properties +++ b/locales/en-GB/server.properties @@ -242,4 +242,4 @@ errorDeletingFile=Failed to delete the file! thimbleByMozilla=Thimble By Mozilla remixWithThimble=Remix this project with Thimble remix=Remix -createdBy=By {{ author }} \ No newline at end of file +createdBy=By {{ author }} diff --git a/locales/en-US/server.properties b/locales/en-US/server.properties old mode 100644 new mode 100755 index 20c0718a9..62b9d1d4b --- a/locales/en-US/server.properties +++ b/locales/en-US/server.properties @@ -15,15 +15,21 @@ newProjectBtn=Start a project from scratch contactEmail=Email Us contactTwitter=Talk to us on Twitter readTheDocs=Read the Docs -contribute=Contribute on Github +contribute=Contribute on GitHub termsOfUse=Terms of Use privacyPolicy=Privacy Policy thimbleFooter=Thimble is part of the Mozilla Learning Network.
Learn to teach like mozilla at learning.mozilla.org. - +pageTitleGetInvolved=Thimble by Mozilla - Get Involved +pageTitleFeatures=Thimble by Mozilla - Features # Userbar signInPromptHomepage= or +# Reload Preview Page +errorCantLoadPreviewTitle=Oh no, something's wrong! +errorCantLoadPreview=We could not load the preview, please reload to try again... +reloadButtonLabel=Reload + ############ ## Editor ## ############ @@ -31,18 +37,31 @@ signInPromptHomepage=get help here. +reloadThimbleMessage=Please reload your browser to try loading Thimble again. +errorCouldNotStart=Thimble could not start. errorLoadingProject=There was an error loading your Project.
Please refresh your browser. errorLoadingProjectSuggestion=NOTE: if you are using Private Browsing mode, please reload in normal mode. errorUnsupportedBrowser=Sorry, Thimble won't work in your Browser errorUnsupportedBrowserSuggestion1=Thimble works in all of the following browsers: Firefox, Chrome, Internet Explorer 11, Microsoft Edge, Safari (8+), and Opera. errorUnsupportedBrowserIgnore=Let me try anyway! errorLoadingProjectBramble=For error details open your browser's Developer Tools console. +refreshForUpdates=Thimble has Updates - Please refresh your browser to get the latest changes. +projectNotLoadingMessage=Your project seems to be taking a long time to load.
If it doesn't load, please reload the page to try again. +tryAgainButtonLabel=Try Again +emailForHelp=If that doesn't help, let us know. # Userbar +userbarGetStarted=Get Started +userbarCoolFeatures=Cool Features +userbarGetInvolved=Get Involved help=Help +helpTroubleshooting=Troubleshooting +helpFAQ=FAQ +helpFeatures=Features deleteProjectLink=Delete Project downloadProjectLink=Download files (.zip) signInPromptEditor= or to Save and {{ publishBtnOpenTag }}Publish{{ publishBtnCloseTag }} +backToHomepage=Go back to the Thimble homepage # Navigation bar navFiles=FILES @@ -50,51 +69,155 @@ navHTMLFile=Add HTML file navCSSFile=Add CSS file navJavascriptFile=Add JavaScript file navTutorialFile=Add a Tutorial -navUploadFile=Upload a file... +# Tooltip shown for adding a new folder in the files menu +navAddFolderTitle=Add a new Folder +# Text to display in the files menu for adding a new folder +navAddFolder=Add Folder +navUploadFile=Upload a file… navEditor=EDITOR navUndo=Undo navTextSize=Text size -navColorTheme=Colour theme +navColorTheme=Color theme navWrapText=Wrap long lines navAllowJS=Allow JavaScript +navAllowWS=Show White Space +navAutoComplete=Autocomplete code +navAutoEncloseTags=Auto close tags +navSVGedit=Edit SVG images as code navPreview=PREVIEW navViewTutorial=TUTORIAL navToggleAutoUpdateTitle=Toggle Preview Auto-refresh navToggleAutoUpdateLabel=Auto # Code Snippet Data +snippetHTMLComment=Comment +snippetHTMLCommentTitle=Add a Comment # Example text inside a comment which in HTML will be and in CSS/JS will be /* Add your comment here */ +snippetCommentData=Add your comment here +snippetHTMLTable=Table +snippetHTMLTableTitle=Add a Table +snippetHTMLTableHeading=Heading +snippetHTMLTableValue=Value +snippetHTMLDefinitionList=Definition List +snippetHTMLDefinitionListTitle=Add a Definition List +snippetHTMLOrderedList=Ordered List +snippetHTMLOrderedListTitle=Add an Ordered List +snippetHTMLItem1=Item 1 +snippetHTMLItem2=Item 2 +snippetHTMLItem3=Item 3 +snippetHTMLUnorderedList=Unordered List +snippetHTMLUnorderedListTitle=Add an Unordered List +snippetHTMLForm=Form +snippetHTMLFormTitle=Add a Form # Label in a form next to an input text box +snippetHTMLFormFirstNameLabel=First name # Label in a form next to an input text box +snippetHTMLFormLastNameLabel=Last name # Submit button text in a form +snippetHTMLFormSubmit=Submit +snippetHTMLScript=Include a JavaScript file +snippetHTMLScriptTitle=Add a Script +snippetHTMLExternalStylesheet=Include a CSS file +snippetHTMLExternalStylesheetTitle=Add an External Stylesheet +snippetHTMLExternalStyleSheetComment=Add the tag to your HTML file. These usually go in the tag +snippetHTMLVideo=Video Player +snippetHTMLVideoTitle=Add a Video player to your page # Text that shows up between the tags as a fallback +snippetHTMLVideoData=Your browser does not support the video tag. +snippetHTMLAudio=Audio Player +snippetHTMLAudioTitle=Add an Audio player to your page # Text that shows up between the tags as a fallback +snippetHTMLAudioData=Your browser does not support the audio tag. +snippetHTMLMetaMobile=Mobile Meta +snippetHTMLMetaMobileTitle=Add Mobile Metadata +snippetCSSComment=Comment +snippetCSSCommentTitle=Add a Comment to your CSS file +snippetCSSTagNameSelector=Element Type Selector +snippetCSSTagNameSelectorTitle=Style a tag by name +snippetCSSClassSelector=Class Selector +snippetCSSClassSelectorTitle=Style elements with a class +snippetCSSIDSelector=ID Selector +snippetCSSIDSelectorTitle=Style an element by its ID +snippetCSSKeyframe=Keyframe Animation +snippetCSSKeyframeTitle=Add a Keyframe Animation # Description of animation code inside a CSS comment /* The animation code */ +snippetCSSKeyframeAnimationComment=The animation code # Description of animation code inside a CSS comment /* The element to apply the animation to */ +snippetCSSKeyframeAnimationTargetComment=The element to apply the animation to +snippetCSSAnchorStyle=Link Styles +snippetCSSAnchorStyleTitle=Style an Anchor Tag # Description of unvisited anchor CSS selector inside a CSS comment /* unvisited link */ +snippetCSSAnchorStyleUnvisitedLinkComment=Basic Style # Description of visited anchor CSS selector inside a CSS comment /* visited link */ +snippetCSSAnchorStyleVisitedLinkComment=Visited # Description of mouseover anchor CSS selector inside a CSS comment /* mouseover link */ +snippetCSSAnchorStyleHoverLinkComment=Hovered # Description of selected anchor CSS selector inside a CSS comment /* selected link */ +snippetCSSAnchorStyleActiveLinkComment=Active +snippetCSSMediaQuery=Media Queries +snippetCSSMediaQueryTitle=Add a Media Query # Description of data to add for a CSS media query inside a CSS comment /* Rules when screen is up to 320px wide */ +snippetCSSMediaQueryNarrow=Rules when screen is up to 320px wide # Description of data to add for a CSS media query inside a CSS comment /* Rules when screen is between 321px and 768px wide */ +snippetCSSMediaQueryMedium=Rules when screen is between 321px and 768px wide # Description of data to add for a CSS media query inside a CSS comment /* Rules when screen is wider than 768px */ +snippetCSSMediaQueryWide=Rules when screen is wider than 768px +snippetCSSFont=Fonts +snippetCSSFontTitle=Declare a Font +snippetCSSPseudo=Add a Pseudo Element +snippetCSSPseudoTitle=Add content to your page with CSS using a pseudo element # Description of an example :after CSS pseudo selector that will show up in CSS comment /* Adds an arrow before every element with class='arrow' */ +snippetCSSPseudoComment=Adds an arrow before every element with class='arrow' +snippetJSFunction=A Basic Function +snippetJSFunctionTitle=Add a simple function that accepts one argument +snippetJSComment=Comment +snippetJSCommentTitle=Add a Comment to your JavaScript file # This will go inside a console.log(). Please leave the quotes in the translated string and do not translate `name` as it is a javascript variable. For eg. the string will be displayed as `console.log("Hello, " + name);` +snippetJSLogHello="Hello, " + name # This will go inside a console.log(). +snippetJSLogHelloStranger=Hello, stranger! # A common person's name that will be used in a snippet. For e.g. `functionCall("David")` +snippetJSPersonName1=David # A common person's name that will be used in a snippet. For e.g. `functionCall("Bob")` +snippetJSPersonName2=Bob # A common person's name that will be used in a snippet. For e.g. `functionCall("Kate")` +snippetJSPersonName3=Kate +snippetJSForLoop=For Loop +snippetJSForLoopTitle=Add a For Loop # Description of what needs to happen inside a JS loop as a JS comment // Do something in this loop +snippetJSLoopData=Do something in this loop +snippetJSWhileLoop=While Loop +snippetJSWhileLoopTitle=Add a While Loop +snippetJSSwitchCase=Switch Statement +snippetJSSwitchCaseTitle=Add a Switch/Case conditional # Description of what needs to happen inside a JS conditional block (if/switch) as a JS comment // Do something for this case +snippetJSConditionalComment=Do something for this case # Description of what needs to happen inside the fallback JS conditional block (else/default) as a JS comment // Do something if no condition was met +snippetJSConditionalDefaultComment=Do something if no condition was met +snippetJSIfElse=If...Else Statement +snippetJSIfElseTitle=Add an If...Else conditional +snippetJSArray=Array +snippetJSArrayTitle=Create an Array +snippetJSObject=Object +snippetJSObjectTitle=Create an Object Literal +snippetJSClickHandler=Add a Click Event +snippetJSClickHandlerTitle=Do something when an element is clicked # Description of an example of using document.querySelector() which will show up in a JS comment // Select an element with id="button" +snippetJSClickHandlerComment=Select an element with id="button" # Will show up as `console.log("Click!")` +snippetJSClickHandlerLog=Click! +snippetJSChangeStyle=Change CSS Property +snippetJSChangeStyleTitle=Change a CSS property of an element # Description of an example of changing an HTML element's style in JS which will show up in a JS comment // Select the element with id='alert' +snippetJSChangeStyleComment=Select the element with id='alert' # Publishing +publishShareLink=Here's a link you can share… publishChangesPrompt=You've made changes since you last published this project. publishProjectDescription=Project Description publishCancelBtn=Cancel +noIndexFound=Please add an "index.html" file before publishing your project. Learn more +publishEmbedLinkTitle=Copy this code into your HTML page to show off your project. ################## ## Project List ## @@ -102,20 +225,113 @@ publishCancelBtn=Cancel prjListNewProjectBtn=Create a new Project prjListDeleteProjectBtn=Delete +prjListCancelDeleteProjectBtn=Cancel publishedLink=Published Version +deleteProjects=Delete Projects ################### ## Features page ## ################### - +featuresHeader=Awesome features make learning
and teaching coding easy & fun +featuresCallout=Thimble is a full-featured code editor that runs right in the browser. It's designed to help new coders create their own sites and web-based projects using HTML, CSS & JavaScript. Everything you need is at your fingertips, allowing you (or your classroom) to get up and running as quickly as possible. +featuresCalloutDesc=It's a code editor, web server, web browser & developer tools all in one—and it's free! + +livePreviewFeatureTitle=Instantly see your changes +livePreviewFeatureDesc=Create and experiment and faster with the Live Preview. It shows the changes to your code instantly. +remixFeatureTitle=Remix any Thimble project +remixFeatureDesc=Like a Thimble project that you see? Remix it to create your very own version. You can also send your project to friends or students—what they can come up with? +snippetsFeatureTitle=Handy Code Snippets +snippetsFeatureDesc=Work faster by making use a handy list of HTML, CSS & JavaScript code snippets that you can include in your code. +consoleFeatureTitle=Built-in JavaScript Console +consoleFeatureDesc=Working on some JavaScript? Thimble's built-in console makes it easier than ever to test and debug your code. +fileTreeFeatureTitle=Add and manage files +fileTreeFeatureDesc=Thimble works like a real web project, you can create, rename, delete and even upload your own files. +fileTreeFeatureDescHighlight1=Download a .zip of your project and view it from your hard drive +fileTreeFeatureDescHighlight2=Drag & drop files from your computer into Thimble +fileTreeFeatureDescHighlight3=Download any file in your project via the right-click menu +themeFeatureTitle=Turn the lights on and off +themeFeatureDesc=Thimble comes with a dark and light theme, so pick what's best for you. You can also change other options like the size of the text. +tutorialFeatureTitle=Follow & create embedded tutorials +tutorialFeatureDesc=Projects can have tutorials that help you (or your students) learn as they make changes to the projects. +autocompleteFeatureTitle=Get code hints as you type +autocompleteFeatureDesc=Don't get stuck trying to remember a lot of rules and syntax. Thimble will give you hints in HTML, CSS and even JavaScript files. +inlineCSSFeatureTitle=Edit CSS right in your HTML pages +inlineCSSFeatureDesc=Write CSS styles for your elements without switching away from the HTML page that you are editing. Put the text cursor on any element tag and hit Cmd/Ctrl + E to start writing CSS styles. +publishingFeatureTitle=Publish projects to the web fast +publishingFeatureDesc=You can publish your projects to the web with only a single click. Later on, when you make changes, you can easily update your project. +colorpickerFeatureTitle=Pick colors right in the editor +colorpickerFeatureDesc=Put the text cursor on any color value in a CSS file and press Cmd/Ctrl + E to open the color picker. +previewModesFeatureTitle=Test your project on a mobile device +previewModesFeatureDesc=Switching to the mobile preview mode lets you see your work on a narrow device. Then, turn on the full-screen preview to get the big picture. +inspectorFeatureTitle=Find HTML elements fast +inspectorFeatureDesc=Turn on the DOM Inspector and hover over different elements in the preview. Thimble will highlight the related code in the HTML editor. +imageFiltersFeatureTitle=Image Filters +imageFiltersFeatureDesc=Add some fun to your project by adding filters to your images. Cats never looked so good before! +takeASelfieFeatureTitle=Take a Selfie +takeASelfieFeatureDesc=Add your mugshot to any page your're working on using Thimble's selfie tool—it uses your computer's webcam. Just start typing <img src= tag to your HTML page and you'll see a prompt. ####################### ## Get Involved page ## ####################### - - +getInvolvedHeader=Curious about Open Source?
Help us build & improve Thimble! +fileAnIssueBtn=File an issue +goodFirstBugBtn=Find a “Good First Bug” to work on +whyContributeTitle=Why Contribute? +contributeReason1=Your work impacts users all over the world +contributeReason2=Gain valuable experience and mentorship +contributeReason3=Support Mozilla's mission of an open internet for all +contributeReason4=It feels good! +getInvolvedDescription1=Thimble is an Open Source project created by the Mozilla Foundation in partnership with CDOT at Seneca College. Since the beginning, contributors from all over the world have played an important role in making it a success. +getInvolvedDescription2=It's truly an international project, it has been localized in 33 languages (with over 100 in progress) and used by learners in over 200 countries. +noContributionTooSmallTitle=No contribution is too small +noContributionTooSmallDesc=Contributions of all skills and backgrounds are welcome. You don't need to be an expert programmer, in fact, over half of our contributors identify themselves as students. You can start small, file an issue to… +noContributionTooSmallReason1=Report bug, problem or typo +noContributionTooSmallReason2=Request a change, new feature or starter project +noContributionTooSmallReason3=Leave feedback +goFileAnIssueBtn=Go on, File an Issue! +feelingAdventurous=If you're feeling adventurous, then check out our GitHub repositories below. +onGithub=On GitHub +goodFirstBugsBadge=Good First Bugs +contributingGuidelines=Contributing Guidelines +getInTouch=Get in Touch +getInTouchChat=Thimble Chat Channel +getInTouchEmail=Email us + +featuredContributors=Featured Contributors +featuredContributorsDesc=Over 350 contributors from more than 30 countries have been involved in the Thimble project. Here are some of the many generous folks that have contributed their time & energy to make Thimble better! + +twigz20Contrib1=Added a code snippets menu to make coding easier +twigz20Contrib2=Fixed JavaScript auto toggle bugs +twigz20Quote=“When first starting on Thimble I had little to no experience/knowledge of JavaScript. It took me a while to get my bearings. As I started working on this project I had many hurdles to cross. But with the help of the core team I was able to slowly cross those hurdles. I still have lots to learn, but I'm happy with the progress so far!” +sanariaz154Contrib1=Added extra padding to the Editor to improve legibility +sanariaz154Quote=“We all need people who will give us feedback. That's how we improve. Working with Thimble was the most encouraging experience for me in opensource world and it gave me a chance to work with most friendly and supporting team.” +raygervaisContrib1=Added a JavaScript console to help learners to debug their code and find errors +raygervaisContrib2=Improved the usability of Thimble menus +raygervaisQuote=“Contributing to Thimble enabled me to learn about modern JavaScript web applications, an experience which has already helped further my career to new heights and possibilities. Open Source has changed the world, and with it, I believe we can do anything.” +hkiratContrib1=Created a custom UI to edit parameters for A-frame tags +hkiratContrib2=Made code completion an optional setting +hkiratContrib3=Researched tech approaches to collaborative editing +hkiratQuote=“Working on Thimble has been a great experience. The code is very well written and the mentors are really supportive. It is one of the best projects to work in if you want to start working on open source and contributing has taught me a lot about open source best practices.” +cgsinghContrib1=Added descriptions to projects page +cgsinghContrib2=Made auto closing tags an optional setting +cgsinghContrib3=Fixed a longstanding usability bug with the Publish button +cgsinghQuote=“Jumping into Thimble the first time around was daunting. But then I started to contribute, and it became satisfying. I learned a lot about what I usually sidelined — web development. In Open Source development, I never felt alone. Bring all these talented minds together, and something as great as Thimble can happen.” +peiying16Contrib1fix=Added support for file icons in the file list +peiying16Contrib2=Fixed bug related to JavaScript settings +peiying16Contrib3=Support for editing SVG files right in the editor +peiying16Quote=“I love Thimble, and I love fixing bug with Thimble team.” +th30Contrib1=Updated menu transition effects +th30Contrib2=Made sure files are properly highlighted in the editor +th30Quote=“Working with thimble proved to be challenging and explosive way to get into open source. It really made me collaborate and work with some amazing individuals, which always made you feel like your mistakes are merely opportunities to further improve your releases. Persistence is key, and always turn feedback into a lesson opportunity!” +omytryniukContrib1=Improved the built-in image viewer UI +omytryniukContrib2=Added several UI improvements and fixed front-end styling and functionality bugs +omytryniukContrib3=Updated node dependencies in the Thimble project +omytryniukQuote=“For me, working on Thimble is not just about gaining valuable programming experience but more importantly a feeling of accomplishment and contributing to a product that is used by people all around the world. Realizing that millions of people benefit from the code I write is what drove me to apply to work on Thimble. The other important factor is the friendly and supportive community within the project which is another reason that makes my open source development experience with Thimble fascinating.” +timmoyContrib1=Fixed a bug related to the auto-refresh setting on the preview panel — it now remembers the setting when the browser is refreshed +timmoyContrib2=Added a feature that lets you add filters to images in a project +timmoyQuote=“Prior to Thimble, I worked with relatively small programs that I coded myself or in a small group. Working on code that spans hundreds (probably thousands!) of files being worked on by over 300 people definitely opened up my mind in what “working with others” could mean. I found that there is definitely a learning curve to get used to the environment, but there's always friendly faces that will help you get started as well as with troubles you may have along the way. Just after a few months, I'm able to contribute to the community more than I imagined before. Imagine the possibilities that we can all achieve together as open source continues to grow!” ############ ## Shared ## @@ -144,11 +360,14 @@ contributeTitle=Contribute # Remix projects gallery lessonPlan=Lesson Plan gallerySearchPlaceholder=Search for a topic +viewProject=View +byAuthor=By noResultsTitle=Oh no! No matching projects found. noResultsText=You can clear your search to see featured projects and popular tags. -projectLoadingInProgress=Loading projects... +projectLoadingInProgress=Loading projects… projectLoadingError=Unable to load project gallery! Let us know! clearSearchTerm=Clear the search term +submitProject=Do you have a good starter project? We'd love to include it. Let us know! ############ ## Editor ## @@ -162,14 +381,15 @@ renameProjectInputBoxTitle=Rename your Project helpIconTitle=Visit the Help site # Navigation bar -navAddFileIconTitle=Add a file to your project -navHTMLTitle=Add an HTML file -navCSSTitle=Add a CSS file -navJavascriptTitle=Add a JavaScript file -navTutorialTitle=Add a Tutorial +navAddFileIconTitle=New file +navHTMLTitle=New HTML file +navCSSTitle=New CSS file +navJavascriptTitle=New JavaScript file +navTutorialTitle=New Tutorial navUploadTitle=Upload a file from your computer navCollapseFileTrayIconTitle=Collapse the file tray navExpandFileTrayIconTitle=Expand the file tray +snippetMenuTitle=Insert a Code Snippet navUndoTitle=Undo your last edit navRedoIconTitle=Redo your last edit navEditorOptionsIconTitle=Change editor options @@ -179,6 +399,10 @@ navDarkThemeIconTitle=Switch to the dark theme navLightThemeIconTitle=Switch to the light theme navWrapTextTitle=Toggle wrapping long lines of code navAllowJSTitle=Toggle running JavaScript code in the preview +navAllowWSTitle=Toggle running WhiteSpace Indicator +navAutoCompleteTitle=Toggle Autocomplete +navAutoEncloseTagsTitle=Toggle automatically closing HTML tags +navXMLSVGTitle=View SVG files as code instead of as image navPreviewTitle=View the Preview navViewTutorialTitle=View the Project Tutorial navDOMElementInspectorIconTitle=Toggle Element Inspector @@ -187,8 +411,10 @@ navDesktopPreviewIconTitle=Preview in desktop mode navMobilePreviewIconTitle=Preview in mobile mode navEnableFullscreenPreviewIconTitle=Enable fullscreen preview navDisableFullscreenPreviewIconTitle=Disable fullscreen preview +navInsertSnippetIconTitle=Add a code snippet # Snippet Menu +snippetButtonLabel=Insert # Publishing publishShareLinkTitle=Your published project @@ -201,6 +427,7 @@ publishBtnTitle=Publish and share your Project prjListNewProjectBtnTitle=Start a new project from scratch prjListDeleteProjectBtnTitle=Delete this Project +prjListCancelDeleteProjectBtnTitle=Cancel deletion of this project ############ ## Shared ## @@ -209,6 +436,8 @@ prjListDeleteProjectBtnTitle=Delete this Project # Errors errorDetailsHeader=Error Details errorSomethingWentWrong=Oops, something went wrong! +errorNotSureWhatWrong=We're not sure what went wrong, but why don't you try again. +errorKeepSeeingPage=If you keep seeing this page, please let us know... errorPageNotFound=Oh no, page not found! errorPageNotFoundDetails=If you think this page should be here,
let us know. errorSomethingWentWrongDetails=Please try what you did again. If you keep seeing this error, let us know. @@ -217,7 +446,7 @@ errorHttpAuthenticationFailed=Authentication Failed ({{ httpStatusCode }}) errorHttpClientError=Thimble Application Error ({{ httpStatusCode }}) errorHttpNotFound=Not Found ({{ httpStatusCode }}) errorLoadingThimble=Failed to load Thimble! -errorAuthenticating=Failed to login! +errorAuthenticating=Failed to log in! errorMigratingProject=Failed to recover the project you were working on! errorCreatingProject=Failed to create the project! errorGettingProjectList=Failed to get the list of your projects! @@ -232,6 +461,10 @@ errorGettingProjectFiles=Failed to get the project's files! errorCreatingFile=Failed to create new file! errorUpdatingFile=Failed to update the file! errorDeletingFile=Failed to delete the file! +pleaseSignOut=Please Sign Out +pleaseSignOutMessage=Something went wrong on our end, but if you Sign Out and then Sign In again, things should return to normal. +signOutButtonLabel=Sign Out Now +letUsKnowMessage=If you keep seeing this page, let us know... ####################### ## Project Remix Bar ## diff --git a/public/editor/scripts/ui/publisher.js b/public/editor/scripts/ui/publisher.js index e734164ef..0c9edc15c 100644 --- a/public/editor/scripts/ui/publisher.js +++ b/public/editor/scripts/ui/publisher.js @@ -44,7 +44,6 @@ function Publisher() { container: $("#publish-live") } }; - this.$("#link-publish-embed").text("Testing"); this.dialogEl = $("#publish-dialog"); this.button = $("#navbar-publish-button"); } From 36786b283145271a10a6523576e9047c8f651e41 Mon Sep 17 00:00:00 2001 From: Fatehsandhu Date: Wed, 22 Nov 2017 11:50:50 -0500 Subject: [PATCH 14/25] Jquery not working help --- public/editor/scripts/ui/publisher.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/editor/scripts/ui/publisher.js b/public/editor/scripts/ui/publisher.js index 0c9edc15c..2c30f1c68 100644 --- a/public/editor/scripts/ui/publisher.js +++ b/public/editor/scripts/ui/publisher.js @@ -33,7 +33,7 @@ function Publisher() { update: $("#publish-button-update"), unpublish: $("#publish-button-unpublish"), parent: $("#publish-buttons"), - indexMessage: $("#no-index"), + indexMessage: $("#no-index") }, description: $("#publish-details > textarea.publish-description"), embed: $("#link-publish-embed"), @@ -314,7 +314,6 @@ Publisher.prototype.updateDialog = function(publishUrl, allowUnpublish) { var published = this.dialog.published; var unpublishBtn = this.dialog.buttons.unpublish; var unpublish = this.handlers.unpublish; - published.embed.text(""); // Expose the published state with the updated link published.link.attr("href", publishUrl).text(publishUrl); From c1ab81eb872a9ffb9aa103c23b14c166da4e2505 Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Thu, 23 Nov 2017 16:23:23 -0500 Subject: [PATCH 15/25] Update publisher.js --- public/editor/scripts/ui/publisher.js | 1 - 1 file changed, 1 deletion(-) diff --git a/public/editor/scripts/ui/publisher.js b/public/editor/scripts/ui/publisher.js index 2c30f1c68..cec083715 100644 --- a/public/editor/scripts/ui/publisher.js +++ b/public/editor/scripts/ui/publisher.js @@ -37,7 +37,6 @@ function Publisher() { }, description: $("#publish-details > textarea.publish-description"), embed: $("#link-publish-embed"), - published: { link: $("#publish-link > a"), changed: $("#publish-changes"), From 5c5519de5e81e1cbaccf2125f7afbac7b44b0f89 Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Thu, 23 Nov 2017 16:24:07 -0500 Subject: [PATCH 16/25] Update publisher.js --- public/editor/scripts/ui/publisher.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/editor/scripts/ui/publisher.js b/public/editor/scripts/ui/publisher.js index cec083715..34eb22ec9 100644 --- a/public/editor/scripts/ui/publisher.js +++ b/public/editor/scripts/ui/publisher.js @@ -313,7 +313,7 @@ Publisher.prototype.updateDialog = function(publishUrl, allowUnpublish) { var published = this.dialog.published; var unpublishBtn = this.dialog.buttons.unpublish; var unpublish = this.handlers.unpublish; - published.embed.text(""); + published.embed.text(``); // Expose the published state with the updated link published.link.attr("href", publishUrl).text(publishUrl); published.changed.addClass("hide"); From 25abc0f83be72770fbf2b379c55d5afefceeb19d Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Thu, 23 Nov 2017 16:25:28 -0500 Subject: [PATCH 17/25] Update setup-services.sh --- scripts/setup-services.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/setup-services.sh b/scripts/setup-services.sh index 512a98660..e0e19976c 100755 --- a/scripts/setup-services.sh +++ b/scripts/setup-services.sh @@ -84,7 +84,6 @@ cd login.webmaker.org cp env.sample .env sudo npm install --no-bin-links --loglevel=error # sudo needed for bcrypt permissions cd .. -sudo npm install --no-bin-links || sudo npm install --no-bin-links # --- # --- id.webmaker.org setup and database setup --- From 1aaec7af9f0e3a75970215265e12d14f8178e135 Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Thu, 23 Nov 2017 16:27:06 -0500 Subject: [PATCH 18/25] Update publish.html --- views/editor/publish.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/editor/publish.html b/views/editor/publish.html index fd1fee63e..e016ed3f3 100644 --- a/views/editor/publish.html +++ b/views/editor/publish.html @@ -23,7 +23,6 @@

{{ gettext("publishHeader") }}

{{ gettext("publishEmbedLinkTitle") }}

@@ -46,4 +45,5 @@

{{ gettext("publishHeader") }}

{{ gettext("publishBtn") }}
-{% endblock %} \ No newline at end of file + +{% endblock %} From 901b84fab5b7a1f641066659ce557f8a82f799c4 Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Sun, 31 Dec 2017 21:52:06 -0500 Subject: [PATCH 19/25] Update publisher.js --- public/editor/scripts/ui/publisher.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/public/editor/scripts/ui/publisher.js b/public/editor/scripts/ui/publisher.js index 34eb22ec9..ff5dd4b3c 100644 --- a/public/editor/scripts/ui/publisher.js +++ b/public/editor/scripts/ui/publisher.js @@ -36,7 +36,7 @@ function Publisher() { indexMessage: $("#no-index") }, description: $("#publish-details > textarea.publish-description"), - embed: $("#link-publish-embed"), + publishHeader: $(".content > h1"), published: { link: $("#publish-link > a"), changed: $("#publish-changes"), @@ -148,6 +148,13 @@ Publisher.prototype.publish = function(bramble) { publisher.dialogEl.removeClass("cannot-publish"); publisher.dialogEl.width(publisher.dialogEl.width()); } + if ($("#publish-button-update").is(":visible")) { + $("#updateDialog").show(); + $("#no-index-update") + .removeClass("hide") + .addClass("show"); + } + publisher.dialogEl.addClass("cannot-publish"); return; } @@ -228,6 +235,11 @@ Publisher.prototype.unpublish = function() { return; } + $("#updateDialog").hide(); + $("#no-index-update") + .removeClass("show") + .addClass("hide"); + var didConfirm = window.confirm(TEXT_UNPUBLISH_WARNING); if (!didConfirm) { @@ -313,7 +325,7 @@ Publisher.prototype.updateDialog = function(publishUrl, allowUnpublish) { var published = this.dialog.published; var unpublishBtn = this.dialog.buttons.unpublish; var unpublish = this.handlers.unpublish; - published.embed.text(``); + // Expose the published state with the updated link published.link.attr("href", publishUrl).text(publishUrl); published.changed.addClass("hide"); From 02c3fb452f290f20c13b92f169aee66da573ef9b Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Sun, 31 Dec 2017 21:53:26 -0500 Subject: [PATCH 20/25] Update publish.html --- views/editor/publish.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/views/editor/publish.html b/views/editor/publish.html index e016ed3f3..eccd60fbf 100644 --- a/views/editor/publish.html +++ b/views/editor/publish.html @@ -1,4 +1,5 @@ {% block publishdialog %} +{% set learnMoreURL = "https://github.com/mozilla/thimble.mozilla.org/wiki/Using-Thimble-FAQ#why-do-i-need-an-indexhtml-file-when-publishing-my-project" %}
{{ gettext("publishHeader") }} - -

{{ gettext("publishEmbedLinkTitle") }}

-
@@ -39,11 +36,14 @@

{{ gettext("publishHeader") }}

- {% set learnMoreURL = "https://github.com/mozilla/thimble.mozilla.org/wiki/Using-Thimble-FAQ#why-do-i-need-an-indexhtml-file-when-publishing-my-project" %} -
{{ gettext("noIndexFound") | instantiate | safe }}
+
{{ gettext("noIndexFound_2") | instantiate | safe }}
{{ gettext("publishCancelBtn") }}
{{ gettext("publishBtn") }}
+ +
+
{{ gettext("noIndexFound_2") | instantiate | safe }}
+
{% endblock %} From 0428408c61cb864086249d4c6415f26c58fd3585 Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Sun, 31 Dec 2017 22:06:25 -0500 Subject: [PATCH 21/25] Update server.properties --- locales/en-US/server.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en-US/server.properties b/locales/en-US/server.properties index 62b9d1d4b..f9ba36056 100755 --- a/locales/en-US/server.properties +++ b/locales/en-US/server.properties @@ -217,7 +217,7 @@ publishChangesPrompt=You've made changes since you last published this project. publishProjectDescription=Project Description publishCancelBtn=Cancel noIndexFound=Please add an "index.html" file before publishing your project. Learn more -publishEmbedLinkTitle=Copy this code into your HTML page to show off your project. +publishEmbedLinkTitle=Copy this code into your HTML page to show off your project ################## ## Project List ## From 66572fa5d74dcbca6de5e70758913a7cf4921edd Mon Sep 17 00:00:00 2001 From: Fatehsandhu Date: Sun, 31 Dec 2017 22:13:20 -0500 Subject: [PATCH 22/25] New --- locales/en-US/server.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en-US/server.properties b/locales/en-US/server.properties index f9ba36056..a6caf3a6b 100755 --- a/locales/en-US/server.properties +++ b/locales/en-US/server.properties @@ -217,7 +217,7 @@ publishChangesPrompt=You've made changes since you last published this project. publishProjectDescription=Project Description publishCancelBtn=Cancel noIndexFound=Please add an "index.html" file before publishing your project. Learn more -publishEmbedLinkTitle=Copy this code into your HTML page to show off your project +# publishEmbedLinkTitle=Copy this code into your HTML page to show off your project ################## ## Project List ## From f6b2c1f6e1d17afd1ea91d2190ddc88c05300ade Mon Sep 17 00:00:00 2001 From: Fatehsandhu Date: Sun, 31 Dec 2017 22:15:02 -0500 Subject: [PATCH 23/25] New --- locales/en-US/server.properties | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/locales/en-US/server.properties b/locales/en-US/server.properties index a6caf3a6b..4d88deef4 100755 --- a/locales/en-US/server.properties +++ b/locales/en-US/server.properties @@ -216,8 +216,7 @@ publishShareLink=Here's a link you can share… publishChangesPrompt=You've made changes since you last published this project. publishProjectDescription=Project Description publishCancelBtn=Cancel -noIndexFound=Please add an "index.html" file before publishing your project. Learn more -# publishEmbedLinkTitle=Copy this code into your HTML page to show off your project +noIndexFound_2=Published projects need an "index.html" page, please add it and try again. Learn more ################## ## Project List ## @@ -256,7 +255,7 @@ tutorialFeatureTitle=Follow & create embedded tutorials tutorialFeatureDesc=Projects can have tutorials that help you (or your students) learn as they make changes to the projects. autocompleteFeatureTitle=Get code hints as you type autocompleteFeatureDesc=Don't get stuck trying to remember a lot of rules and syntax. Thimble will give you hints in HTML, CSS and even JavaScript files. -inlineCSSFeatureTitle=Edit CSS right in your HTML pages +inlineCSSFeatureTitle=Edit CSS right in your HTML pages inlineCSSFeatureDesc=Write CSS styles for your elements without switching away from the HTML page that you are editing. Put the text cursor on any element tag and hit Cmd/Ctrl + E to start writing CSS styles. publishingFeatureTitle=Publish projects to the web fast publishingFeatureDesc=You can publish your projects to the web with only a single click. Later on, when you make changes, you can easily update your project. @@ -324,7 +323,7 @@ peiying16Contrib3=Support for editing SVG files right in the editor peiying16Quote=“I love Thimble, and I love fixing bug with Thimble team.” th30Contrib1=Updated menu transition effects th30Contrib2=Made sure files are properly highlighted in the editor -th30Quote=“Working with thimble proved to be challenging and explosive way to get into open source. It really made me collaborate and work with some amazing individuals, which always made you feel like your mistakes are merely opportunities to further improve your releases. Persistence is key, and always turn feedback into a lesson opportunity!” +th30Quote=“Working with Thimble proved to be challenging and explosive way to get into open source. It really made me collaborate and work with some amazing individuals, which always made you feel like your mistakes are merely opportunities to further improve your releases. Persistence is key, and always turn feedback into a lesson opportunity!” omytryniukContrib1=Improved the built-in image viewer UI omytryniukContrib2=Added several UI improvements and fixed front-end styling and functionality bugs omytryniukContrib3=Updated node dependencies in the Thimble project @@ -412,6 +411,8 @@ navMobilePreviewIconTitle=Preview in mobile mode navEnableFullscreenPreviewIconTitle=Enable fullscreen preview navDisableFullscreenPreviewIconTitle=Disable fullscreen preview navInsertSnippetIconTitle=Add a code snippet +navTextSizeTitle=Change the editor font size +navColorThemeTitle=Change the editor color theme # Snippet Menu snippetButtonLabel=Insert @@ -473,4 +474,4 @@ letUsKnowMessage=If you keep seeing this page, let us know... thimbleByMozilla=Thimble By Mozilla remixWithThimble=Remix this project with Thimble remix=Remix -createdBy=By {{ author }} +createdBy=By {{ author }} \ No newline at end of file From 94d5557056ac778fc9e10bc7058cf41fea06ba22 Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Sun, 31 Dec 2017 22:23:44 -0500 Subject: [PATCH 24/25] Update server.properties --- locales/en-US/server.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/locales/en-US/server.properties b/locales/en-US/server.properties index 4d88deef4..dca3a703e 100755 --- a/locales/en-US/server.properties +++ b/locales/en-US/server.properties @@ -217,6 +217,7 @@ publishChangesPrompt=You've made changes since you last published this project. publishProjectDescription=Project Description publishCancelBtn=Cancel noIndexFound_2=Published projects need an "index.html" page, please add it and try again. Learn more +publishEmbedLinkTitle=Copy this code into your HTML page to show off your project ################## ## Project List ## @@ -474,4 +475,4 @@ letUsKnowMessage=If you keep seeing this page, let us know... thimbleByMozilla=Thimble By Mozilla remixWithThimble=Remix this project with Thimble remix=Remix -createdBy=By {{ author }} \ No newline at end of file +createdBy=By {{ author }} From a4c44e0c9d8260e4d013fc840bbae7ea2ba170d8 Mon Sep 17 00:00:00 2001 From: Fateh Sandhu Date: Sun, 31 Dec 2017 22:24:20 -0500 Subject: [PATCH 25/25] Update server.properties --- locales/en-US/server.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/locales/en-US/server.properties b/locales/en-US/server.properties index dca3a703e..4aab55ecd 100755 --- a/locales/en-US/server.properties +++ b/locales/en-US/server.properties @@ -217,7 +217,6 @@ publishChangesPrompt=You've made changes since you last published this project. publishProjectDescription=Project Description publishCancelBtn=Cancel noIndexFound_2=Published projects need an "index.html" page, please add it and try again. Learn more -publishEmbedLinkTitle=Copy this code into your HTML page to show off your project ################## ## Project List ##