Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Creates Ability to Purchase Translations in Localization Editor Window #783

Open
wants to merge 48 commits into
base: develop
Choose a base branch
from

Commits on Jun 18, 2014

  1. Created a new translation window. Will commit more frequently in the …

    …future. Check comments for explanations
    Benjamin Koatz committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    76a3633 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'develop' of https://github.com/spritebuilder/SpriteBuilder

     into develop
    
    Conflicts:
    	SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj
    Benjamin Koatz committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    7b4560d View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2014

  1. Small project change

    Benjamin Koatz committed Jun 19, 2014
    Configuration menu
    Copy the full SHA
    157ff6a View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2014

  1. Merge branch 'develop' of https://github.com/spritebuilder/SpriteBuilder

     into develop
    
    Conflicts:
    	SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj
    Benjamin Koatz committed Jun 20, 2014
    Configuration menu
    Copy the full SHA
    1aef6b9 View commit details
    Browse the repository at this point in the history
  2. Moved the numerous items and messages that overlapped under the 'tran…

    …slate from' menu into separate views of a single tab view, some other small formatting edits.
    Benjamin Koatz committed Jun 20, 2014
    Configuration menu
    Copy the full SHA
    1319546 View commit details
    Browse the repository at this point in the history
  3. Translate window changes that I forgot to put in last commit (whoops)…

    …. Also now if you delete the last active language, the window is updated to reflect the 'no active langs' error message with appropriate reloading/hiding/setting of table and drop down menu and info button
    Benjamin Koatz committed Jun 20, 2014
    Configuration menu
    Copy the full SHA
    3d8fbbb View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2014

  1. Made it so that clicking elsewhere in the window closes the translate…

    … info popover if it is open. Also did some formatting changes to make the code a bit clearer.
    Benjamin Koatz committed Jun 23, 2014
    Configuration menu
    Copy the full SHA
    a062ac2 View commit details
    Browse the repository at this point in the history
  2. just the project file from the pref commit

    Benjamin Koatz committed Jun 23, 2014
    Configuration menu
    Copy the full SHA
    c4e0658 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2014

  1. Coordinated with the server to get language downloading and estimatio…

    …n working, and added a few more error views along with some internal error checking and code cleaning
    Benjamin Koatz committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    61b30dd View commit details
    Browse the repository at this point in the history
  2. Reorganized a bunch of code and added pragma marks, along with adding…

    … the feature that languages are added to the active languages of the Language Window if they are translated to in the translate window. Buying still doesn't work that much but it's getting there.
    Benjamin Koatz committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    005161f View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2014

  1. Stylized the window better (read: more compactly). Also got receipt v…

    …alidation to work on client, end still waiting for server capabilities
    Benjamin Koatz committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    e2a1b30 View commit details
    Browse the repository at this point in the history
  2. Started working on putting translation progress in the Language Windo…

    …w. And changed the name of the button from Translate! to Buy Translations
    Benjamin Koatz committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    bafbf72 View commit details
    Browse the repository at this point in the history
  3. Finally got the translate window to be key and modal. Also did a bunc…

    …h of context-based enabling/disabling and started working on the translation bar in the Language Window.
    Benjamin Koatz committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    d4fcefe View commit details
    Browse the repository at this point in the history
  4. A couple compiler errors/warnings in the last commit, fixed.

    Benjamin Koatz committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    a6ca5a2 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2014

  1. Continued working on cancel functionality. Created window, set up the…

    … disabling/enabling, etc. So currently everything works except for actually canceling. So, don't press 'yes' on the cancel window
    Benjamin Koatz committed Jun 26, 2014
    Configuration menu
    Copy the full SHA
    cc3264d View commit details
    Browse the repository at this point in the history
  2. Got rid of (in my opinion) a lot of cool functionality, but functiona…

    …lity that depended on the translation window not being modal. Also some cancelation changes and general code cleaning. Weird bug in the purchasing mechanism but I think it's related to sandbox environment. Can't find examples online.
    Benjamin Koatz committed Jun 26, 2014
    Configuration menu
    Copy the full SHA
    715dba8 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2014

  1. Fixed payment mechanism even on edge cases

    Benjamin Koatz committed Jun 27, 2014
    Configuration menu
    Copy the full SHA
    17ef128 View commit details
    Browse the repository at this point in the history
  2. fixed receipt uploading and parsing issues, and received the first va…

    …lid response message to a translation request!!
    Benjamin Koatz committed Jun 27, 2014
    Configuration menu
    Copy the full SHA
    41dea2c View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2014

  1. Implemented more functionality for dealing with the server. Get trans…

    …lations not working yet but it will be, I have faith! Also a method in EditorLanguage that simplifies my life.
    Benjamin Koatz committed Jun 28, 2014
    Configuration menu
    Copy the full SHA
    4071009 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2014

  1. Cached and serialized the data about downloading languages and update…

    …d the way the Language Window does bindings accordingly. Also made some minor UI changes in accordance with Apple's guidelines
    Benjamin Koatz committed Jul 1, 2014
    Configuration menu
    Copy the full SHA
    1649ada View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2014

  1. More caching and state-saving, better use of project settings to do s…

    …o and more edge cases fixed. No more crashes after editor window is closed and reopened. Also, downloads restart automatically when a language window is reopened
    Benjamin Koatz committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    c205603 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2014

  1. Add more error handling and working parsing for translations (though …

    …the server-side of the parsing is not working yet). Have to handle cancels with errors and more server interaction once that is ready. Also commented, cleaned and styled code.
    Benjamin Koatz committed Jul 3, 2014
    Configuration menu
    Copy the full SHA
    b7d1d93 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2014

  1. Error handling for payment errors, fixed small bugs with project sett…

    …ings and some weird stuff about windows and alerts
    Benjamin Koatz committed Jul 7, 2014
    Configuration menu
    Copy the full SHA
    9738133 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2014

  1. Smarter error handling for server timeouts and receipt validation fix…

    …es along with small bug fixes and apple stylization stuff. Also a new alert to inform people of long download times
    Benjamin Koatz committed Jul 8, 2014
    Configuration menu
    Copy the full SHA
    f3fe986 View commit details
    Browse the repository at this point in the history
  2. Some very small code changes and error stuff

    Benjamin Koatz committed Jul 8, 2014
    Configuration menu
    Copy the full SHA
    97192d2 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'temp' into develop

    Conflicts:
    	SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj
    	SpriteBuilder/ccBuilder/ProjectSettings.h
    	SpriteBuilder/ccBuilder/SBErrors.h
    	SpriteBuilder/ccBuilder/SBErrors.m
    Benjamin Koatz committed Jul 8, 2014
    Configuration menu
    Copy the full SHA
    c2b0f47 View commit details
    Browse the repository at this point in the history
  4. Fixed compile errors

    Benjamin Koatz committed Jul 8, 2014
    Configuration menu
    Copy the full SHA
    f13b3aa View commit details
    Browse the repository at this point in the history
  5. Merge branch 'develop' of https://github.com/spritebuilder/SpriteBuilder

     into develop
    Benjamin Koatz committed Jul 8, 2014
    Configuration menu
    Copy the full SHA
    3b29b56 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2014

  1. Redid payment queue logic so it works, redid project setting and loca…

    …lization editor handler logic so it works even when the downloading project isn't the current one, along with other small changes.
    Benjamin Koatz committed Jul 11, 2014
    Configuration menu
    Copy the full SHA
    2bb1c2b View commit details
    Browse the repository at this point in the history
  2. small changes to make reloading and background translations work seam…

    …lessly.
    Benjamin Koatz committed Jul 11, 2014
    Configuration menu
    Copy the full SHA
    16bb9e2 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2014

  1. Just changed some error checking stuff

    Benjamin Koatz committed Jul 14, 2014
    Configuration menu
    Copy the full SHA
    76dc3b4 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'develop' of https://github.com/spritebuilder/SpriteBuilder

     into develop
    Benjamin Koatz committed Jul 14, 2014
    Configuration menu
    Copy the full SHA
    65f556c View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2014

  1. Improved the refresh mechanism for translation window after editor wi…

    …ndow is changed, created a tooltip for translation progress.
    Benjamin Koatz committed Jul 17, 2014
    Configuration menu
    Copy the full SHA
    2d38731 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2014

  1. Fixed product requests to only ask for the products needed. Also adde…

    …d 9 more products.
    Benjamin Koatz committed Jul 18, 2014
    Configuration menu
    Copy the full SHA
    3ce8dd4 View commit details
    Browse the repository at this point in the history
  2. Commiting merge

    Benjamin Koatz committed Jul 18, 2014
    Configuration menu
    Copy the full SHA
    c9617b1 View commit details
    Browse the repository at this point in the history
  3. Moved In App PID plist into resources folder of project

    Benjamin Koatz committed Jul 18, 2014
    Configuration menu
    Copy the full SHA
    e8e4072 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2014

  1. Starts downloads on app start and disables the "Localize" check butto…

    …n in the main window when there is a download
    
    Also cancels non-translation urlsessiontasks on closing the translate window. And now correctly handles the case when a project with a pending translation is moved or deleted.
    Benjamin Koatz committed Jul 22, 2014
    Configuration menu
    Copy the full SHA
    96238b2 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2014

  1. Made small changes to UI for clarity of text and layout

    Benjamin Koatz committed Aug 5, 2014
    Configuration menu
    Copy the full SHA
    1a707c1 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2014

  1. Merge branch 'develop' of https://github.com/spritebuilder/SpriteBuilder

     into develop
    
    Conflicts:
    	SpriteBuilder/ccBuilder/AppDelegate.h
    	SpriteBuilder/ccBuilder/AppDelegate.m
    	SpriteBuilder/ccBuilder/ProjectSettings.m
    Benjamin Koatz committed Aug 11, 2014
    Configuration menu
    Copy the full SHA
    b1061da View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2014

  1. Configuration menu
    Copy the full SHA
    5d076a2 View commit details
    Browse the repository at this point in the history
  2. Added all 85 sprite builder translation tiers

    Benjamin Koatz committed Aug 14, 2014
    Configuration menu
    Copy the full SHA
    63638fb View commit details
    Browse the repository at this point in the history
  3. Merge branch 'develop' of https://github.com/spritebuilder/SpriteBuilder

     into develop
    Benjamin Koatz committed Aug 14, 2014
    Configuration menu
    Copy the full SHA
    d96e40c View commit details
    Browse the repository at this point in the history
  4. Add pragma mark to app delegate for restarting project translation do…

    …wnloads
    Benjamin Koatz committed Aug 14, 2014
    Configuration menu
    Copy the full SHA
    de05d39 View commit details
    Browse the repository at this point in the history
  5. Add ifdefs to handle the appropriate behavior for sprite builder v sp…

    …rite builder pro
    
    Makes it so the buy translations button disappears on sprite builder pro, and translation downloads aren't attempted to be updated in the app delegate
    Benjamin Koatz committed Aug 14, 2014
    Configuration menu
    Copy the full SHA
    f2fdc42 View commit details
    Browse the repository at this point in the history
  6. Change properties from strong to copy and weak where needed

    NSStrings became copies and parent-child references that would've resulted in retain cycles were fixed
    Benjamin Koatz committed Aug 14, 2014
    Configuration menu
    Copy the full SHA
    b43ac93 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2014

  1. Deal with localization editor window state for closed v open projects…

    … in both Spritebuilder Pro and regular Spritebuilder
    
    Revolves around hasOpenFile and uses the fact whether project settings is null or not.
    Benjamin Koatz committed Aug 15, 2014
    Configuration menu
    Copy the full SHA
    de1eacb View commit details
    Browse the repository at this point in the history
  2. Updates process for parsing translations into background translation …

    …request, now using resourcePaths
    Benjamin Koatz committed Aug 15, 2014
    Configuration menu
    Copy the full SHA
    726726e View commit details
    Browse the repository at this point in the history
  3. Merge branch 'develop' of https://github.com/spritebuilder/SpriteBuilder

     into develop
    Benjamin Koatz committed Aug 15, 2014
    Configuration menu
    Copy the full SHA
    dad94b5 View commit details
    Browse the repository at this point in the history